commit c3b2cb5f1ae8f9bfdfe4a607246f89a3135de688
author Nikhil Kumar <nykkumar@google.com> Mon Aug 14 15:56:07 2023 +0100
committer Eric Biggers <ebiggers@google.com> Wed Nov 01 19:51:48 2023 +0000
tree 8af273bd08216aadc9774ef15e64d017c3288cac
parent a0b29244afc4ba42ba8bc8180d83bd8689e50bd2

Removing non SYSTEM user before running systemUserOnlyTest

Bug: 295446676
Test: atest UserManagerServiceTest -c
Change-Id: I6f536b7f5b85e4e884bd284b1848e43ac3c9029d
(cherry picked from commit b1bba3e972890edfdb33b063e741baa6745f5283)
Merged-In: I6f536b7f5b85e4e884bd284b1848e43ac3c9029d

services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java

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 7cd8819..d687915 100644
--- a/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceTest.java
@@ -320,11 +320,20 @@
     @Test
     public void testGetBootUser_Headless_ThrowsIfOnlySystemUserExists() throws Exception {
         setSystemUserHeadless(true);
+        removeNonSystemUsers();
 
         assertThrows(UserManager.CheckedUserOperationException.class,
                 () -> mUmi.getBootUser(/* waitUntilSet= */ false));
     }
 
+    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);