Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable flaky unit test in LocationManagerServiceTest" into udc-dev

Browse Source
This commit is contained in:
David Christie
2023-03-27 23:52:20 +00:00
committed by Android (Google) Code Review
parent bb4f84d541 73b52c1126
commit 7d760762dc
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/tests/mockingservicestests/src/com/android/server/location/LocationManagerServiceTest.java
View File

@@ -53,6 +53,7 @@ import com.google.common.util.concurrent.MoreExecutors;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -69,6 +70,7 @@ public class LocationManagerServiceTest {
private static final int CURRENT_USER = FakeUserInfoHelper.DEFAULT_USERID; private static final int CURRENT_USER = FakeUserInfoHelper.DEFAULT_USERID;
private static final String CALLER_PACKAGE = "caller_package"; private static final String CALLER_PACKAGE = "caller_package";
private static final String MISSING_PERMISSION = "missing_permission"; private static final String MISSING_PERMISSION = "missing_permission";
private static final String ATTRIBUTION_TAG = "test_tag";
private TestInjector mInjector; private TestInjector mInjector;
private LocationManagerService mLocationManagerService; private LocationManagerService mLocationManagerService;
@@ -136,6 +138,7 @@ public class LocationManagerServiceTest {
} }
@Test @Test
@Ignore("b/274432939") // Test is flaky for as of yet unknown reasons
public void testRequestLocationUpdates() { public void testRequestLocationUpdates() {
LocationRequest request = new LocationRequest.Builder(0).build(); LocationRequest request = new LocationRequest.Builder(0).build();
mLocationManagerService.registerLocationListener( mLocationManagerService.registerLocationListener(
@@ -143,7 +146,7 @@ public class LocationManagerServiceTest {
request, request,
mLocationListener, mLocationListener,
CALLER_PACKAGE, CALLER_PACKAGE,
/* attributionTag= */ null, ATTRIBUTION_TAG,
"any_listener_id"); "any_listener_id");
verify(mProviderWithPermission).onSetRequestPublic(any()); verify(mProviderWithPermission).onSetRequestPublic(any());
} }
@@ -159,7 +162,7 @@ public class LocationManagerServiceTest {
request, request,
mLocationListener, mLocationListener,
CALLER_PACKAGE, CALLER_PACKAGE,
/* attributionTag= */ null, ATTRIBUTION_TAG,
"any_listener_id")); "any_listener_id"));
} }