Rename user0, user1, rename-user-invalid

4 files changed, 13 insertions, 13 deletions

diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf
index 3f386c28..f7e9c20e 100644
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -6,7 +6,7 @@
 minimum-display-number=50
 
 [SeatDefaults]
-autologin-user=rename-user-invalid
+autologin-user=change-user-invalid
 
 #?RUNNER DAEMON-START
 
diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf
index 50d638f9..9f03b008 100644
--- a/tests/scripts/user-renamed.conf
+++ b/tests/scripts/user-renamed.conf
@@ -6,7 +6,7 @@
 minimum-display-number=50
 
 [SeatDefaults]
-autologin-user=user0
+autologin-user=change-user1
 
 #?RUNNER DAEMON-START
 
@@ -18,7 +18,7 @@ autologin-user=user0
 #?XSERVER :50 ACCEPT-CONNECT
 
 # Session starts
-#?SESSION :50 START USER=user1
+#?SESSION :50 START USER=change-user2
 #?XSERVER :50 ACCEPT-CONNECT
 #?SESSION :50 CONNECT-XSERVER
 
diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c
index b75e7e06..2629f317 100644
--- a/tests/src/libsystem.c
+++ b/tests/src/libsystem.c
@@ -343,15 +343,15 @@ pam_authenticate (pam_handle_t *pamh, int flags)
     if (password_matches && strcmp (pamh->user, "mount-home-dir") == 0)
         g_mkdir_with_parents (entry->pw_dir, 0755);
 
-    /* Special user 'user0' changes user on authentication */
-    if (password_matches && strcmp (pamh->user, "user0") == 0)
+    /* Special user 'change-user1' changes user on authentication */
+    if (password_matches && strcmp (pamh->user, "change-user1") == 0)
     {
         g_free (pamh->user);
-        pamh->user = g_strdup ("user1");
+        pamh->user = g_strdup ("change-user2");
     }
 
-    /* Special user 'rename-user-invalid' changes to an invalid user on authentication */
-    if (password_matches && strcmp (pamh->user, "rename-user-invalid") == 0)
+    /* Special user 'change-user-invalid' changes to an invalid user on authentication */
+    if (password_matches && strcmp (pamh->user, "change-user-invalid") == 0)
     {
         g_free (pamh->user);
         pamh->user = g_strdup ("invalid-user");
diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c
index e483d732..945a79ff 100644
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -1333,11 +1333,11 @@ main (int argc, char **argv)
         {"expired",          "",         TRUE,  "Expired User",       NULL,  NULL, NULL,          NULL,          1014},
         /* This account needs a password change */
         {"new-authtok",      "",         TRUE,  "New Token User",     NULL,  NULL, NULL,          NULL,          1015},
-        /* user0 is switched to user1 when authentication succeeds */
-        {"user0",            "",         TRUE,  "User 0",             NULL,  NULL, NULL,          NULL,          1016},
-        {"user1",            "",         TRUE,  "User 1",             NULL,  NULL, NULL,          NULL,          1017},
-        /* rename-user-invalid switches to invalid-user when authentication succeeds */
-        {"rename-user-invalid",   "",    TRUE,  "User 1",             NULL,  NULL, NULL,          NULL,          1018},
+        /* change-user1 is switched to change-user2 when authentication succeeds */
+        {"change-user1",     "",         TRUE,  "Change User 1",      NULL,  NULL, NULL,          NULL,          1016},
+        {"change-user2",     "",         TRUE,  "Change User 2",      NULL,  NULL, NULL,          NULL,          1017},
+        /* change-user-invalid switches to invalid-user when authentication succeeds */
+        {"change-user-invalid", "",      TRUE,  "Invalid Change User",NULL,  NULL, NULL,          NULL,          1018},
         {NULL,               NULL,       FALSE, NULL,                 NULL,  NULL, NULL,          NULL,             0}
     };
     passwd_data = g_string_new ("");