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

Merge "Revert "Remove flaky tests from presubmit."" into tm-dev

Browse Source
This commit is contained in:
Adam Bookatz
2022-03-03 18:13:09 +00:00
committed by Android (Google) Code Review
parent 0c0fc66390 71f2a510ff
commit 44ee044a6f
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/coretests/src/android/content/ManagedUserContentResolverTest.java
View File

@@ -20,6 +20,7 @@ import android.content.pm.UserInfo;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.platform.test.annotations.Presubmit;
import androidx.test.filters.LargeTest; import androidx.test.filters.LargeTest;
@@ -36,6 +37,7 @@ import androidx.test.filters.LargeTest;
* Run: adb shell am instrument -e class android.content.ManagedUserContentResolverTest -w \ * Run: adb shell am instrument -e class android.content.ManagedUserContentResolverTest -w \
* com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner
*/ */
@Presubmit
@LargeTest @LargeTest
public class ManagedUserContentResolverTest extends AbstractCrossUserContentResolverTest { public class ManagedUserContentResolverTest extends AbstractCrossUserContentResolverTest {
@Override @Override

2
core/tests/coretests/src/android/content/SecondaryUserContentResolverTest.java
View File

@@ -18,6 +18,7 @@ package android.content;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.os.RemoteException; import android.os.RemoteException;
import android.platform.test.annotations.Presubmit;
import androidx.test.filters.LargeTest; import androidx.test.filters.LargeTest;
@@ -34,6 +35,7 @@ import androidx.test.filters.LargeTest;
* Run: adb shell am instrument -e class android.content.SecondaryUserContentResolverTest -w \ * Run: adb shell am instrument -e class android.content.SecondaryUserContentResolverTest -w \
* com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner * com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner
*/ */
@Presubmit
@LargeTest @LargeTest
public class SecondaryUserContentResolverTest extends AbstractCrossUserContentResolverTest { public class SecondaryUserContentResolverTest extends AbstractCrossUserContentResolverTest {
@Override @Override