From 82efbd0ef064dc4c5a06484b5c19a98136d7a52f Mon Sep 17 00:00:00 2001 From: Nikhil Kumar Date: Mon, 14 Aug 2023 15:56:07 +0100 Subject: Removing non SYSTEM user before running systemUserOnlyTest Bug: 295446676 Test: atest UserManagerServiceTest -c Change-Id: I6f536b7f5b85e4e884bd284b1848e43ac3c9029d Merged-In: I6f536b7f5b85e4e884bd284b1848e43ac3c9029d (cherry picked from commit b1bba3e972890edfdb33b063e741baa6745f5283) --- .../src/com/android/server/pm/UserManagerServiceTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java index 980e442f9c15..d34cc6eaa50a 100644 --- a/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java @@ -323,6 +323,7 @@ public final class UserManagerServiceTest { @Test public void testGetBootUser_Headless_ThrowsIfOnlySystemUserExists() throws Exception { setSystemUserHeadless(true); + removeNonSystemUsers(); assertThrows(UserManager.CheckedUserOperationException.class, () -> mUmi.getBootUser(/* waitUntilSet= */ false)); @@ -346,6 +347,14 @@ public final class UserManagerServiceTest { return resultString.toString(); } + private void removeNonSystemUsers() { + for (UserInfo user : mUms.getUsers(true)) { + if (!user.getUserHandle().isSystem()) { + mUms.removeUserInfo(user.id); + } + } + } + private void mockCurrentUser(@UserIdInt int userId) { mockGetLocalService(ActivityManagerInternal.class, mActivityManagerInternal); -- cgit v1.2.3-59-g8ed1b