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

Merge "Mark tests as flaky to exclude from presubmit."

Browse Source
This commit is contained in:
Pavel Grafov
2020-02-05 18:57:54 +00:00
committed by Android (Google) Code Review
parent ddd7be3a66 e380b4cff0
commit 698008d24a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
View File

@@ -96,6 +96,7 @@ import android.test.MoreAsserts;
import android.util.ArraySet;
import android.util.Pair;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.SmallTest;
import com.android.internal.R;
@@ -5446,6 +5447,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
assertTrue(dpms.isAdminActive(admin1, UserHandle.USER_SYSTEM));
}
@FlakyTest(bugId = 148934649)
public void testRevertDeviceOwnership_adminAndDeviceMigrated() throws Exception {
DpmTestUtils.writeInputStreamToFile(
getRawStream(com.android.frameworks.servicestests.R.raw.active_admin_migrated),
@@ -5456,6 +5458,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
assertDeviceOwnershipRevertedWithFakeTransferMetadata();
}
@FlakyTest(bugId = 148934649)
public void testRevertDeviceOwnership_deviceNotMigrated()
throws Exception {
DpmTestUtils.writeInputStreamToFile(
@@ -5487,6 +5490,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
UserHandle userHandle = UserHandle.of(DpmMockContext.CALLER_USER_HANDLE);
}
@FlakyTest(bugId = 148934649)
public void testRevertProfileOwnership_adminAndProfileMigrated() throws Exception {
getServices().addUser(DpmMockContext.CALLER_USER_HANDLE, 0,
UserManager.USER_TYPE_PROFILE_MANAGED, UserHandle.USER_SYSTEM);
@@ -5499,6 +5503,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
assertProfileOwnershipRevertedWithFakeTransferMetadata();
}
@FlakyTest(bugId = 148934649)
public void testRevertProfileOwnership_profileNotMigrated() throws Exception {
getServices().addUser(DpmMockContext.CALLER_USER_HANDLE, 0,
UserManager.USER_TYPE_PROFILE_MANAGED, UserHandle.USER_SYSTEM);