diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-02-27 14:44:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-27 14:44:15 +0000 |
commit | 6cc74fb4d2e07ecb7fa205d883dfc1e2ac3140ce (patch) | |
tree | dcf0f7fb4197a811aaa1582bff96418c48ee4cb6 | |
parent | d87f82011d4f21ae322447d33c9fd05bebdb4b63 (diff) | |
parent | c5dc89869cf120240db3ecc76a0f3033ad380153 (diff) | |
download | cts-6cc74fb4d2e07ecb7fa205d883dfc1e2ac3140ce.tar.gz |
Merge "Disable failing DMRH tests for now" into android13-tests-dev am: c5dc89869c
Original change: https://android-review.googlesource.com/c/platform/cts/+/2440941
Change-Id: I83c3d883d68ae98eb09551f1d3e7e90e5ac6f6fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagementRoleHolderTest.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagementRoleHolderTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagementRoleHolderTest.java index f85d895d643..31eaebecfd8 100644 --- a/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagementRoleHolderTest.java +++ b/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagementRoleHolderTest.java @@ -71,13 +71,14 @@ import com.android.eventlib.truth.EventLogsSubject; import com.android.queryable.queries.ActivityQuery; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; // TODO(b/228016400): replace usages of createAndProvisionManagedProfile with a nene API @RunWith(BedsteadJUnit4.class) -public class DevicePolicyManagementRoleHolderTest { +public class DevicePolicyManagementRoleHolderTest { // TODO: This is crashing on non-headless - figure it out - on headless it d't run with btest so follow up.... @ClassRule @Rule public static final DeviceState sDeviceState = new DeviceState(); @@ -135,6 +136,7 @@ public class DevicePolicyManagementRoleHolderTest { + ".TestAppAccountAuthenticatorService")) .get(); + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "new test") @RequireFeature(FEATURE_MANAGED_USERS) @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS) @@ -174,6 +176,7 @@ public class DevicePolicyManagementRoleHolderTest { } } + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "new test") @RequireFeature(FEATURE_MANAGED_USERS) @EnsureHasDeviceOwner @@ -216,6 +219,7 @@ public class DevicePolicyManagementRoleHolderTest { } } + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "new test") @RequireFeature(FEATURE_MANAGED_USERS) @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS) @@ -246,6 +250,7 @@ public class DevicePolicyManagementRoleHolderTest { } } + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "new test") @RequireFeature(FEATURE_MANAGED_USERS) @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS) @@ -277,6 +282,7 @@ public class DevicePolicyManagementRoleHolderTest { } } + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "new test") @RequireFeature(FEATURE_MANAGED_USERS) @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS) @@ -308,6 +314,7 @@ public class DevicePolicyManagementRoleHolderTest { } } + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "New test") @Test @EnsureHasPermission(MANAGE_ROLE_HOLDERS) @@ -326,6 +333,7 @@ public class DevicePolicyManagementRoleHolderTest { } // TODO(b/222669810): add ensureHasNoAccounts annotation + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "New test") @Test @EnsureHasPermission(MANAGE_ROLE_HOLDERS) @@ -350,6 +358,7 @@ public class DevicePolicyManagementRoleHolderTest { } // TODO(b/222669810): add ensureHasNoAccounts annotation + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "New test") @Test @RequireFeature(FEATURE_MANAGED_USERS) @@ -373,6 +382,7 @@ public class DevicePolicyManagementRoleHolderTest { .isFalse(); } + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "New test") @Test @EnsureHasPermission(MANAGE_ROLE_HOLDERS) @@ -393,6 +403,7 @@ public class DevicePolicyManagementRoleHolderTest { } } + @Ignore("b/268616097 fix issue with pre-existing accounts on the device") @Postsubmit(reason = "New test") @Test @EnsureDoesNotHavePermission(MANAGE_ROLE_HOLDERS) |