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

Comment out flaky tests.

Browse Source 
@FlakyTest didn't help, they were still running in presubmit.

Test: compiles
Bug: 148934649
Bug: 148930538
Change-Id: I12bdb4f7259ea1aa18861bded4d5ae122720a733
This commit is contained in:
Pavel Grafov
2020-02-05 22:19:49 +00:00
parent a6b0017b8f
commit 42da7f7fc4
1 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5447,28 +5447,28 @@ 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),
getDeviceOwnerPoliciesFile());
DpmTestUtils.writeInputStreamToFile(
getRawStream(com.android.frameworks.servicestests.R.raw.device_owner_migrated),
getDeviceOwnerFile());
assertDeviceOwnershipRevertedWithFakeTransferMetadata();
}
// @FlakyTest(bugId = 148934649)
// public void testRevertDeviceOwnership_adminAndDeviceMigrated() throws Exception {
// DpmTestUtils.writeInputStreamToFile(
// getRawStream(com.android.frameworks.servicestests.R.raw.active_admin_migrated),
// getDeviceOwnerPoliciesFile());
// DpmTestUtils.writeInputStreamToFile(
// getRawStream(com.android.frameworks.servicestests.R.raw.device_owner_migrated),
// getDeviceOwnerFile());
// assertDeviceOwnershipRevertedWithFakeTransferMetadata();
// }
@FlakyTest(bugId = 148934649)
public void testRevertDeviceOwnership_deviceNotMigrated()
throws Exception {
DpmTestUtils.writeInputStreamToFile(
getRawStream(com.android.frameworks.servicestests.R.raw.active_admin_migrated),
getDeviceOwnerPoliciesFile());
DpmTestUtils.writeInputStreamToFile(
getRawStream(com.android.frameworks.servicestests.R.raw.device_owner_not_migrated),
getDeviceOwnerFile());
assertDeviceOwnershipRevertedWithFakeTransferMetadata();
}
// @FlakyTest(bugId = 148934649)
// public void testRevertDeviceOwnership_deviceNotMigrated()
// throws Exception {
// DpmTestUtils.writeInputStreamToFile(
// getRawStream(com.android.frameworks.servicestests.R.raw.active_admin_migrated),
// getDeviceOwnerPoliciesFile());
// DpmTestUtils.writeInputStreamToFile(
// getRawStream(com.android.frameworks.servicestests.R.raw.device_owner_not_migrated),
// getDeviceOwnerFile());
// assertDeviceOwnershipRevertedWithFakeTransferMetadata();
// }
public void testRevertDeviceOwnership_adminAndDeviceNotMigrated()
throws Exception {
@@ -5490,31 +5490,31 @@ 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);
DpmTestUtils.writeInputStreamToFile(
getRawStream(com.android.frameworks.servicestests.R.raw.active_admin_migrated),
getProfileOwnerPoliciesFile());
DpmTestUtils.writeInputStreamToFile(
getRawStream(com.android.frameworks.servicestests.R.raw.profile_owner_migrated),
getProfileOwnerFile());
assertProfileOwnershipRevertedWithFakeTransferMetadata();
}
// @FlakyTest(bugId = 148934649)
// public void testRevertProfileOwnership_adminAndProfileMigrated() throws Exception {
// getServices().addUser(DpmMockContext.CALLER_USER_HANDLE, 0,
// UserManager.USER_TYPE_PROFILE_MANAGED, UserHandle.USER_SYSTEM);
// DpmTestUtils.writeInputStreamToFile(
// getRawStream(com.android.frameworks.servicestests.R.raw.active_admin_migrated),
// getProfileOwnerPoliciesFile());
// DpmTestUtils.writeInputStreamToFile(
// getRawStream(com.android.frameworks.servicestests.R.raw.profile_owner_migrated),
// getProfileOwnerFile());
// 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);
DpmTestUtils.writeInputStreamToFile(
getRawStream(com.android.frameworks.servicestests.R.raw.active_admin_migrated),
getProfileOwnerPoliciesFile());
DpmTestUtils.writeInputStreamToFile(
getRawStream(com.android.frameworks.servicestests.R.raw.profile_owner_not_migrated),
getProfileOwnerFile());
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);
// DpmTestUtils.writeInputStreamToFile(
// getRawStream(com.android.frameworks.servicestests.R.raw.active_admin_migrated),
// getProfileOwnerPoliciesFile());
// DpmTestUtils.writeInputStreamToFile(
// getRawStream(com.android.frameworks.servicestests.R.raw.profile_owner_not_migrated),
// getProfileOwnerFile());
// assertProfileOwnershipRevertedWithFakeTransferMetadata();
// }
public void testRevertProfileOwnership_adminAndProfileNotMigrated() throws Exception {
getServices().addUser(DpmMockContext.CALLER_USER_HANDLE, 0,