diff options
42 files changed, 165 insertions, 147 deletions
diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf index 845c1340..ab1d727f 100644 --- a/tests/scripts/autologin-invalid-session.conf +++ b/tests/scripts/autologin-invalid-session.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 user-session=invalid #?RUNNER DAEMON-START diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf index e3ebaea2..3596ff18 100644 --- a/tests/scripts/autologin-logout.conf +++ b/tests/scripts/autologin-logout.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START @@ -18,7 +18,7 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Autologin session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf index 30ab9abe..9ef4e5e5 100644 --- a/tests/scripts/autologin-previous-session.conf +++ b/tests/scripts/autologin-previous-session.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=carol +autologin-user=have-session #?RUNNER DAEMON-START @@ -18,7 +18,7 @@ autologin-user=carol #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START NAME=alternative USER=carol +#?SESSION :50 START NAME=alternative USER=have-session #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf index 27961030..086ae9b6 100644 --- a/tests/scripts/autologin-session-crash.conf +++ b/tests/scripts/autologin-session-crash.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START @@ -18,7 +18,7 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf index 211b5b65..0bcf6ae9 100644 --- a/tests/scripts/autologin-xserver-crash.conf +++ b/tests/scripts/autologin-xserver-crash.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START @@ -18,7 +18,7 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf index ad95e7fd..bc32b100 100644 --- a/tests/scripts/autologin.conf +++ b/tests/scripts/autologin.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START @@ -18,7 +18,7 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf index 725b08ff..5f3e49ab 100644 --- a/tests/scripts/home-dir-on-authenticate.conf +++ b/tests/scripts/home-dir-on-authenticate.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=dave +autologin-user=mount-home-dir #?RUNNER DAEMON-START @@ -18,7 +18,7 @@ autologin-user=dave #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=dave +#?SESSION :50 START USER=mount-home-dir #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf index 349260f0..0869052b 100644 --- a/tests/scripts/keyboard-layout.conf +++ b/tests/scripts/keyboard-layout.conf @@ -22,13 +22,13 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Correct layout is found -#?*GREETER :50 LOG-LAYOUT USERNAME=bob -#?GREETER :50 LOG-LAYOUT USERNAME=bob LAYOUT='us' -#?*GREETER :50 LOG-LAYOUT USERNAME=carol -#?GREETER :50 LOG-LAYOUT USERNAME=carol LAYOUT='fr oss' -#?*GREETER :50 LOG-LAYOUTS USERNAME=carol -#?GREETER :50 LOG-LAYOUTS USERNAME=carol LAYOUT='fr oss' -#?GREETER :50 LOG-LAYOUTS USERNAME=carol LAYOUT='ru' +#?*GREETER :50 LOG-LAYOUT USERNAME=have-layout +#?GREETER :50 LOG-LAYOUT USERNAME=have-layout LAYOUT='us' +#?*GREETER :50 LOG-LAYOUT USERNAME=have-layouts +#?GREETER :50 LOG-LAYOUT USERNAME=have-layouts LAYOUT='fr oss' +#?*GREETER :50 LOG-LAYOUTS USERNAME=have-layouts +#?GREETER :50 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='fr oss' +#?GREETER :50 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='ru' # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf index e1451e45..ec0ad5fd 100644 --- a/tests/scripts/language-no-accounts-service.conf +++ b/tests/scripts/language-no-accounts-service.conf @@ -25,8 +25,8 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Correct layout is found -#?*GREETER :50 LOG-LANGUAGE USERNAME=bob -#?GREETER :50 LOG-LANGUAGE USERNAME=bob LANGUAGE=en_AU +#?*GREETER :50 LOG-LANGUAGE USERNAME=have-language +#?GREETER :50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf index acacb306..f48f5e3b 100644 --- a/tests/scripts/language.conf +++ b/tests/scripts/language.conf @@ -22,8 +22,8 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Correct layout is found -#?*GREETER :50 LOG-LANGUAGE USERNAME=bob -#?GREETER :50 LOG-LANGUAGE USERNAME=bob LANGUAGE=en_AU +#?*GREETER :50 LOG-LANGUAGE USERNAME=have-language +#?GREETER :50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf index a231cca7..85376aa9 100644 --- a/tests/scripts/lock-seat.conf +++ b/tests/scripts/lock-seat.conf @@ -22,15 +22,15 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Login -#?*GREETER :50 AUTHENTICATE USERNAME=alice +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf index 2753c577..4bc5527b 100644 --- a/tests/scripts/lock-session.conf +++ b/tests/scripts/lock-session.conf @@ -22,15 +22,15 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Login -#?*GREETER :50 AUTHENTICATE USERNAME=alice +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER @@ -51,7 +51,7 @@ minimum-display-number=50 #?GREETER :51 CONNECT-XSERVER #?GREETER :51 CONNECT-TO-DAEMON #?GREETER :51 CONNECTED-TO-DAEMON -#?GREETER :51 SELECT-USER-HINT USERNAME=alice +#?GREETER :51 SELECT-USER-HINT USERNAME=have-password1 #?GREETER :51 LOCK-HINT # Cleanup diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf index 50378887..11eae07e 100644 --- a/tests/scripts/login-invalid-session.conf +++ b/tests/scripts/login-invalid-session.conf @@ -21,11 +21,11 @@ minimum-display-number=50 #?GREETER :50 CONNECT-TO-DAEMON #?GREETER :50 CONNECTED-TO-DAEMON -# Login as alice -#?*GREETER :50 AUTHENTICATE USERNAME=alice +# Log into an account with a password +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION SESSION=invalid #?GREETER :50 TERMINATE SIGNAL=15 diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf index a1c81191..db0f1b36 100644 --- a/tests/scripts/login-logout.conf +++ b/tests/scripts/login-logout.conf @@ -22,15 +22,15 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Log in -#?*GREETER :50 AUTHENTICATE USERNAME=alice +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf index 1d7788af..dde24b4c 100644 --- a/tests/scripts/login-manual-previous-session.conf +++ b/tests/scripts/login-manual-previous-session.conf @@ -21,16 +21,16 @@ minimum-display-number=50 #?GREETER :50 CONNECT-TO-DAEMON #?GREETER :50 CONNECTED-TO-DAEMON -# Login as carol, but let lightdm prompt for a username +# Login as account with a previous session, but let lightdm prompt for a username #?*GREETER :50 AUTHENTICATE #?GREETER :50 SHOW-PROMPT TEXT="login:" -#?*GREETER :50 RESPOND TEXT="carol" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=carol AUTHENTICATED=TRUE +#?*GREETER :50 RESPOND TEXT="have-session" +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START NAME=alternative USER=carol +#?SESSION :50 START NAME=alternative USER=have-session #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf index 681acbe8..dd83c35e 100644 --- a/tests/scripts/login-manual.conf +++ b/tests/scripts/login-manual.conf @@ -21,18 +21,18 @@ minimum-display-number=50 #?GREETER :50 CONNECT-TO-DAEMON #?GREETER :50 CONNECTED-TO-DAEMON -# Login as alice, but let lightdm prompt for a username +# Login as have-password1, but let lightdm prompt for a username #?*GREETER :50 AUTHENTICATE #?GREETER :50 SHOW-PROMPT TEXT="login:" -#?*GREETER :50 RESPOND TEXT="alice" +#?*GREETER :50 RESPOND TEXT="have-password1" #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf index 5533c505..314bed75 100644 --- a/tests/scripts/login-no-password.conf +++ b/tests/scripts/login-no-password.conf @@ -21,14 +21,14 @@ minimum-display-number=50 #?GREETER :50 CONNECT-TO-DAEMON #?GREETER :50 CONNECTED-TO-DAEMON -# Login as bob (no password required) -#?*GREETER :50 AUTHENTICATE USERNAME=bob -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=bob AUTHENTICATED=TRUE +# Log into account without a password +#?*GREETER :50 AUTHENTICATE USERNAME=no-password1 +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=bob +#?SESSION :50 START USER=no-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf index 7282c117..92f7240d 100644 --- a/tests/scripts/login-pick-session.conf +++ b/tests/scripts/login-pick-session.conf @@ -21,16 +21,16 @@ minimum-display-number=50 #?GREETER :50 CONNECT-TO-DAEMON #?GREETER :50 CONNECTED-TO-DAEMON -# Login as alice -#?*GREETER :50 AUTHENTICATE USERNAME=alice +# Login as have-password1 +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION SESSION=alternative #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START NAME=alternative USER=alice +#?SESSION :50 START NAME=alternative USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf index a77153bb..aaa641e2 100644 --- a/tests/scripts/login-previous-session.conf +++ b/tests/scripts/login-previous-session.conf @@ -21,14 +21,14 @@ minimum-display-number=50 #?GREETER :50 CONNECT-TO-DAEMON #?GREETER :50 CONNECTED-TO-DAEMON -# Login as carol -#?*GREETER :50 AUTHENTICATE USERNAME=carol -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=carol AUTHENTICATED=TRUE +# Log into account with a previously chosen session +#?*GREETER :50 AUTHENTICATE USERNAME=have-session +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START NAME=alternative USER=carol +#?SESSION :50 START NAME=alternative USER=have-session #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf index 810b3de6..84c8b77e 100644 --- a/tests/scripts/login-session-crash.conf +++ b/tests/scripts/login-session-crash.conf @@ -21,16 +21,16 @@ minimum-display-number=50 #?GREETER :50 CONNECT-TO-DAEMON #?GREETER :50 CONNECTED-TO-DAEMON -# Login as alice -#?*GREETER :50 AUTHENTICATE USERNAME=alice +# Log into an account with a password +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf index 7e7dc503..56c1f874 100644 --- a/tests/scripts/login-wrong-password.conf +++ b/tests/scripts/login-wrong-password.conf @@ -22,10 +22,10 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Login with invalid password -#?*GREETER :50 AUTHENTICATE USERNAME=alice +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="rubbish" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=FALSE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf index 9ddf1bb3..fb382883 100644 --- a/tests/scripts/login-xserver-crash.conf +++ b/tests/scripts/login-xserver-crash.conf @@ -21,16 +21,16 @@ minimum-display-number=50 #?GREETER :50 CONNECT-TO-DAEMON #?GREETER :50 CONNECTED-TO-DAEMON -# Log in as alice -#?*GREETER :50 AUTHENTICATE USERNAME=alice +# Log into account with a password +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf index b09d9941..ba3120b2 100644 --- a/tests/scripts/login.conf +++ b/tests/scripts/login.conf @@ -21,16 +21,16 @@ minimum-display-number=50 #?GREETER :50 CONNECT-TO-DAEMON #?GREETER :50 CONNECTED-TO-DAEMON -# Login as alice -#?*GREETER :50 AUTHENTICATE USERNAME=alice +# Log into account with a password +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf index 3597e715..e79d2e7b 100644 --- a/tests/scripts/no-accounts-service.conf +++ b/tests/scripts/no-accounts-service.conf @@ -9,7 +9,7 @@ disable-accounts-service=true minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START @@ -21,7 +21,7 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf index 83bc04b6..d778a89a 100644 --- a/tests/scripts/no-console-kit.conf +++ b/tests/scripts/no-console-kit.conf @@ -9,7 +9,7 @@ disable-console-kit=true minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START @@ -21,7 +21,7 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/no-keyboard-layout.conf b/tests/scripts/no-keyboard-layout.conf index 609c3f6f..645ce21e 100644 --- a/tests/scripts/no-keyboard-layout.conf +++ b/tests/scripts/no-keyboard-layout.conf @@ -22,8 +22,8 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Correct layout is found -#?*GREETER :50 LOG-LAYOUT USERNAME=alice -#?GREETER :50 LOG-LAYOUT USERNAME=alice LAYOUT='' +#?*GREETER :50 LOG-LAYOUT USERNAME=have-password1 +#?GREETER :50 LOG-LAYOUT USERNAME=have-password1 LAYOUT='' # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf index f6563fb4..b50957c4 100644 --- a/tests/scripts/no-language.conf +++ b/tests/scripts/no-language.conf @@ -22,8 +22,8 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Correct layout is found -#?*GREETER :50 LOG-LANGUAGE USERNAME=alice -#?GREETER :50 LOG-LANGUAGE USERNAME=alice LANGUAGE= +#?*GREETER :50 LOG-LANGUAGE USERNAME=have-password1 +#?GREETER :50 LOG-LANGUAGE USERNAME=have-password1 LANGUAGE= # Cleanup #?*STOP-DAEMON diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf index 428d26c4..3575342b 100644 --- a/tests/scripts/script-hook-fail-session-setup.conf +++ b/tests/scripts/script-hook-fail-session-setup.conf @@ -7,7 +7,7 @@ minimum-display-number=50 [SeatDefaults] session-setup-script=test-script-hook SESSION-SETUP 1 -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf index 330350fe..7a1a34ca 100644 --- a/tests/scripts/script-hooks.conf +++ b/tests/scripts/script-hooks.conf @@ -10,7 +10,7 @@ display-setup-script=test-script-hook DISPLAY-SETUP greeter-setup-script=test-script-hook GREETER-SETUP session-setup-script=test-script-hook SESSION-SETUP session-cleanup-script=test-script-hook SESSION-CLEANUP -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START @@ -26,7 +26,7 @@ autologin-user=alice #?SCRIPT-HOOK SESSION-SETUP # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf index 498dbc92..d1ec54d4 100644 --- a/tests/scripts/session-stderr.conf +++ b/tests/scripts/session-stderr.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START @@ -18,7 +18,7 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf index cc48b500..5d07e745 100644 --- a/tests/scripts/session-stdout.conf +++ b/tests/scripts/session-stdout.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START @@ -18,7 +18,7 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf index 91a8b0a1..a61046a4 100644 --- a/tests/scripts/switch-to-greeter.conf +++ b/tests/scripts/switch-to-greeter.conf @@ -22,15 +22,15 @@ minimum-display-number=50 #?GREETER :50 CONNECTED-TO-DAEMON # Login -#?*GREETER :50 AUTHENTICATE USERNAME=alice +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf index 1de2069f..b096c51b 100644 --- a/tests/scripts/switch-to-guest.conf +++ b/tests/scripts/switch-to-guest.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START #?*WAIT @@ -19,7 +19,7 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Default session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user-existing-session.conf b/tests/scripts/switch-to-user-existing-session.conf index 282944f2..525618b8 100644 --- a/tests/scripts/switch-to-user-existing-session.conf +++ b/tests/scripts/switch-to-user-existing-session.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START #?*WAIT @@ -19,13 +19,13 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER -# Switch to Alice's account -#?*SWITCH-TO-USER USERNAME=alice -#?RUNNER SWITCH-TO-USER USERNAME=alice +# Switch to account with a password +#?*SWITCH-TO-USER USERNAME=have-password1 +#?RUNNER SWITCH-TO-USER USERNAME=have-password1 # Nothing happends #?*WAIT 1 diff --git a/tests/scripts/switch-to-user-logout.conf b/tests/scripts/switch-to-user-logout.conf index ad69c58b..19088e6d 100644 --- a/tests/scripts/switch-to-user-logout.conf +++ b/tests/scripts/switch-to-user-logout.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START #?*WAIT @@ -19,13 +19,13 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER -# Switch to Bob's account -#?*SWITCH-TO-USER USERNAME=bob -#?RUNNER SWITCH-TO-USER USERNAME=bob +# Switch to an account without a password +#?*SWITCH-TO-USER USERNAME=no-password1 +#?RUNNER SWITCH-TO-USER USERNAME=no-password1 # New X server starts #?XSERVER :51 START @@ -35,7 +35,7 @@ autologin-user=alice #?XSERVER :51 ACCEPT-CONNECT # New session starts -#?SESSION :51 START USER=bob +#?SESSION :51 START USER=no-password1 #?XSERVER :51 ACCEPT-CONNECT #?SESSION :51 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf index c27e718f..f3786300 100644 --- a/tests/scripts/switch-to-user-no-password.conf +++ b/tests/scripts/switch-to-user-no-password.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START #?*WAIT @@ -19,13 +19,13 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER -# Switch to Bob's account -#?*SWITCH-TO-USER USERNAME=bob -#?RUNNER SWITCH-TO-USER USERNAME=bob +# Switch to account without a password +#?*SWITCH-TO-USER USERNAME=no-password1 +#?RUNNER SWITCH-TO-USER USERNAME=no-password1 # New X server starts #?XSERVER :51 START @@ -35,7 +35,7 @@ autologin-user=alice #?XSERVER :51 ACCEPT-CONNECT # New session starts -#?SESSION :51 START USER=bob +#?SESSION :51 START USER=no-password1 #?XSERVER :51 ACCEPT-CONNECT #?SESSION :51 CONNECT-XSERVER diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf index 7284880e..cc726b44 100644 --- a/tests/scripts/switch-to-user.conf +++ b/tests/scripts/switch-to-user.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=bob +autologin-user=no-password1 #?RUNNER DAEMON-START #?*WAIT @@ -19,13 +19,13 @@ autologin-user=bob #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=bob +#?SESSION :50 START USER=no-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER -# Switch to Alice's account -#?*SWITCH-TO-USER USERNAME=alice -#?RUNNER SWITCH-TO-USER USERNAME=alice +# Switch to an account with a password +#?*SWITCH-TO-USER USERNAME=have-password1 +#?RUNNER SWITCH-TO-USER USERNAME=have-password1 # New X server starts #?XSERVER :51 START @@ -41,9 +41,9 @@ autologin-user=bob #?GREETER :51 CONNECT-TO-DAEMON #?GREETER :51 CONNECTED-TO-DAEMON -# Alice is automatically selected -#?GREETER :51 SELECT-USER-HINT USERNAME=alice -#?*GREETER :51 AUTHENTICATE USERNAME=alice +# Requested user is automatically selected +#?GREETER :51 SELECT-USER-HINT USERNAME=have-password1 +#?*GREETER :51 AUTHENTICATE USERNAME=have-password1 #?GREETER :51 SHOW-PROMPT TEXT="Password:" # Cleanup diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf index e7c5f4e2..e4ac78f1 100644 --- a/tests/scripts/switch-to-users.conf +++ b/tests/scripts/switch-to-users.conf @@ -6,7 +6,7 @@ minimum-display-number=50 [SeatDefaults] -autologin-user=alice +autologin-user=have-password1 #?RUNNER DAEMON-START #?*WAIT @@ -19,13 +19,13 @@ autologin-user=alice #?XSERVER :50 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER -# Switch to Bob's account -#?*SWITCH-TO-USER USERNAME=bob -#?RUNNER SWITCH-TO-USER USERNAME=bob +# Switch to account without a password +#?*SWITCH-TO-USER USERNAME=no-password1 +#?RUNNER SWITCH-TO-USER USERNAME=no-password1 # New X server starts #?XSERVER :51 START @@ -35,13 +35,13 @@ autologin-user=alice #?XSERVER :51 ACCEPT-CONNECT # New session starts -#?SESSION :51 START USER=bob +#?SESSION :51 START USER=no-password1 #?XSERVER :51 ACCEPT-CONNECT #?SESSION :51 CONNECT-XSERVER -# Switch to Carol's account -#?*SWITCH-TO-USER USERNAME=carol -#?RUNNER SWITCH-TO-USER USERNAME=carol +# Switch to another account without a password +#?*SWITCH-TO-USER USERNAME=no-password2 +#?RUNNER SWITCH-TO-USER USERNAME=no-password2 # New X server starts #?XSERVER :52 START @@ -51,7 +51,7 @@ autologin-user=alice #?XSERVER :52 ACCEPT-CONNECT # New session starts -#?SESSION :52 START NAME=alternative USER=carol +#?SESSION :52 START USER=no-password2 #?XSERVER :52 ACCEPT-CONNECT #?SESSION :52 CONNECT-XSERVER diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf index 1bcd0bf7..d64c29ae 100644 --- a/tests/scripts/vnc-login.conf +++ b/tests/scripts/vnc-login.conf @@ -39,15 +39,15 @@ port=9999 #?GREETER :50 CONNECTED-TO-DAEMON # Log in -#?*GREETER :50 AUTHENTICATE USERNAME=alice +#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 #?GREETER :50 SHOW-PROMPT TEXT="Password:" #?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER :50 START-SESSION #?GREETER :50 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=alice +#?SESSION :50 START USER=have-password1 #?XSERVER :50 ACCEPT-CONNECT #?SESSION :50 CONNECT-XSERVER diff --git a/tests/scripts/xdmcp-login.conf b/tests/scripts/xdmcp-login.conf index 7dd0a8b7..3167d73a 100644 --- a/tests/scripts/xdmcp-login.conf +++ b/tests/scripts/xdmcp-login.conf @@ -35,15 +35,15 @@ port=9999 #?GREETER 127.0.0.1:98 CONNECTED-TO-DAEMON # Log in -#?*GREETER 127.0.0.1:98 AUTHENTICATE USERNAME=alice +#?*GREETER 127.0.0.1:98 AUTHENTICATE USERNAME=have-password1 #?GREETER 127.0.0.1:98 SHOW-PROMPT TEXT="Password:" #?*GREETER 127.0.0.1:98 RESPOND TEXT="password" -#?GREETER 127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=alice AUTHENTICATED=TRUE +#?GREETER 127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE #?*GREETER 127.0.0.1:98 START-SESSION #?GREETER 127.0.0.1:98 TERMINATE SIGNAL=15 # Session starts -#?SESSION 127.0.0.1:98 START USER=alice +#?SESSION 127.0.0.1:98 START USER=have-password1 #?XSERVER :98 TCP-ACCEPT-CONNECT #?SESSION 127.0.0.1:98 CONNECT-XSERVER diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c index 33af94ff..b75e7e06 100644 --- a/tests/src/libsystem.c +++ b/tests/src/libsystem.c @@ -339,8 +339,8 @@ pam_authenticate (pam_handle_t *pamh, int flags) free (resp); } - /* Special user 'dave' has his home directory created on login */ - if (password_matches && strcmp (pamh->user, "dave") == 0) + /* Special user has home directory created on login */ + 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 */ diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index cb6f4c38..e483d732 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -1303,24 +1303,42 @@ main (int argc, char **argv) gint uid; } users[] = { - {"root", "", TRUE, "root", NULL, NULL, NULL, NULL, 0}, - {"lightdm", "", TRUE, "", NULL, NULL, NULL, NULL, 100}, - {"alice", "password", TRUE, "Alice User", NULL, NULL, NULL, NULL, 1000}, - {"bob", "", TRUE, "Bob User", NULL, "us", NULL, "en_AU.utf8", 1001}, - {"carol", "", TRUE, "Carol User", "alternative", "ru", "fr\toss;ru;", "fr_FR.UTF-8", 1002}, - {"dave", "", FALSE, "Dave User", NULL, NULL, NULL, NULL, 1003}, + /* Root account */ + {"root", "", TRUE, "root", NULL, NULL, NULL, NULL, 0}, + /* Unprivileged account for greeters */ + {"lightdm", "", TRUE, "", NULL, NULL, NULL, NULL, 100}, + /* These accounts have a password */ + {"have-password1", "password", TRUE, "Password User 1", NULL, NULL, NULL, NULL, 1000}, + {"have-password2", "password", TRUE, "Password User 2", NULL, NULL, NULL, NULL, 1001}, + {"have-password3", "password", TRUE, "Password User 3", NULL, NULL, NULL, NULL, 1002}, + {"have-password4", "password", TRUE, "Password User 4", NULL, NULL, NULL, NULL, 1003}, + /* These accounts have no password */ + {"no-password1", "", TRUE, "No Password User 1", NULL, NULL, NULL, NULL, 1004}, + {"no-password2", "", TRUE, "No Password User 2", NULL, NULL, NULL, NULL, 1005}, + {"no-password3", "", TRUE, "No Password User 3", NULL, NULL, NULL, NULL, 1006}, + {"no-password4", "", TRUE, "No Password User 4", NULL, NULL, NULL, NULL, 1007}, + /* This account has a keyboard layout */ + {"have-layout", "", TRUE, "Layout User", NULL, "us", NULL, NULL, 1008}, + /* This account has a set of keyboard layouts */ + {"have-layouts", "", TRUE, "Layouts User", NULL, "ru", "fr\toss;ru;", NULL, 1009}, + /* This account has a language set */ + {"have-language", "", TRUE, "Language User", NULL, NULL, NULL, "en_AU.utf8", 1010}, + /* This account has a preconfigured session */ + {"have-session", "", TRUE, "Session User", "alternative", NULL, NULL, NULL, 1011}, + /* This account has the home directory mounted on login */ + {"mount-home-dir", "", FALSE, "Mounted Home Dir User", NULL, NULL, NULL, NULL, 1012}, /* This account is denied access */ - {"denied", "", TRUE, "Denied User", NULL, NULL, NULL, NULL, 1004}, + {"denied", "", TRUE, "Denied User", NULL, NULL, NULL, NULL, 1013}, /* This account has expired */ - {"expired", "", TRUE, "Expired User", NULL, NULL, NULL, NULL, 1005}, + {"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, 1006}, + {"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, 1007}, - {"user1", "", TRUE, "User 1", NULL, NULL, NULL, NULL, 1008}, + {"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, 1009}, - {NULL, NULL, FALSE, NULL, NULL, NULL, NULL, NULL, 0} + {"rename-user-invalid", "", TRUE, "User 1", NULL, NULL, NULL, NULL, 1018}, + {NULL, NULL, FALSE, NULL, NULL, NULL, NULL, NULL, 0} }; passwd_data = g_string_new (""); int i; |