Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14b73996 authored by David Christie's avatar David Christie Committed by Automerger Merge Worker
Browse files

Merge "Disable flaky unit test in LocationManagerServiceTest" into udc-dev am: 7d760762 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22296789



Change-Id: I2c0061a9067f08c2d89c3514458b9e55f580e83e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e110bfc4 7d760762

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

+5 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.google.common.util.concurrent.MoreExecutors; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -69,6 +70,7 @@ public class LocationManagerServiceTest { 
    private static final int CURRENT_USER = FakeUserInfoHelper.DEFAULT_USERID;

    private static final String CALLER_PACKAGE = "caller_package";

    private static final String MISSING_PERMISSION = "missing_permission";

    private static final String ATTRIBUTION_TAG = "test_tag";



    private TestInjector mInjector;

    private LocationManagerService mLocationManagerService;
@@ -136,6 +138,7 @@ public class LocationManagerServiceTest { 
    }



    @Test

    @Ignore("b/274432939") // Test is flaky for as of yet unknown reasons

    public void testRequestLocationUpdates() {

        LocationRequest request = new LocationRequest.Builder(0).build();

        mLocationManagerService.registerLocationListener(
@@ -143,7 +146,7 @@ public class LocationManagerServiceTest { 
                request,

                mLocationListener,

                CALLER_PACKAGE,

                /* attributionTag= */ null,

                ATTRIBUTION_TAG,

                "any_listener_id");

        verify(mProviderWithPermission).onSetRequestPublic(any());

    }
@@ -159,7 +162,7 @@ public class LocationManagerServiceTest { 
                                request,

                                mLocationListener,

                                CALLER_PACKAGE,

                                /* attributionTag= */ null,

                                ATTRIBUTION_TAG,

                                "any_listener_id"));

    }