diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-05-17 03:51:10 +0000 |
|---|---|---|
| committer | Tarmac <> | 2013-05-17 03:51:10 +0000 |
| commit | 98154277ec77bdbd39eada6cb6a616159c2abb0c (patch) | |
| tree | c52309b67ea3605ce52eaccefcc002fa28af231b | |
| parent | 918fb7295d73686f97c75535b8463e8af93e2015 (diff) | |
| parent | 49723c2ffcd96b2a118ec8165a2865e891667ac5 (diff) | |
| download | lightdm-98154277ec77bdbd39eada6cb6a616159c2abb0c.tar.gz | |
Refactor tests so each object is only required to be in sequence - stops race conditions between each component reporting status
Override XCB to make X tests reliable and predictable, now can't conflict with existing X servers
Remove keyboard layout and variant tests as they rely on specific X/xkb behaviour
Remove sync hack that was avoiding the race conditions.
Approved by Robert Ancell, PS Jenkins bot.
134 files changed, 2363 insertions, 3681 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 3cb70fc9..ffb38656 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -51,8 +51,6 @@ TESTS = \ test-user-renamed-invalid \ test-keyboard-layout \ test-no-keyboard-layout \ - test-default-keyboard-layout \ - test-keyboard-variants \ test-language \ test-no-language \ test-language-no-accounts-service \ @@ -259,7 +257,6 @@ EXTRA_DIST = \ scripts/cred-error.conf \ scripts/cred-expired.conf \ scripts/cred-unavail.conf \ - scripts/default-keyboard-layout.conf \ scripts/denied.conf \ scripts/expired.conf \ scripts/greeter-fail-start.conf \ @@ -270,7 +267,6 @@ EXTRA_DIST = \ scripts/home-dir-on-authenticate.conf \ scripts/home-dir-on-session.conf \ scripts/keyboard-layout.conf \ - scripts/keyboard-variants.conf \ scripts/language.conf \ scripts/language-no-accounts-service.conf \ scripts/lock-seat.conf \ diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf index dadee1c6..f23b3f5f 100644 --- a/tests/scripts/autologin-guest-fail-setup-script.conf +++ b/tests/scripts/autologin-guest-fail-setup-script.conf @@ -4,7 +4,6 @@ [LightDM] guest-account-script=false -minimum-display-number=50 [SeatDefaults] autologin-guest=true @@ -12,24 +11,23 @@ autologin-guest=true #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (guest account attempts to start and fails) # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf index 8b8ad8e9..6048a03b 100644 --- a/tests/scripts/autologin-guest-in-background.conf +++ b/tests/scripts/autologin-guest-in-background.conf @@ -1,64 +1,37 @@ # -# Check automatically logs in default user while keeping a greeter up +# Check automatically logs in guest while keeping a greeter up # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-guest=true autologin-in-background=true #?RUNNER DAEMON-START -# The following is a gross expansion of two simultaneous sequences. One day, -# when we can specify such things in tests, they should look like the -# following: -# -# ?XSERVER :50 START -# ?XSERVER :50 INDICATE-READY -# -# Sequence 1: -# ?XSERVER :50 ACCEPT-CONNECT -# ?GREETER :50 START -# ?XSERVER :50 ACCEPT-CONNECT -# ?GREETER :50 CONNECT-XSERVER -# ?GREETER :50 CONNECT-TO-DAEMON -# ?GREETER :50 CONNECTED-TO-DAEMON -# GREETER/XSERVER TERMINATE -# -# Sequence 2 -# ?XSERVER :51 START -# ?XSERVER :51 INDICATE-READY -# ?XSERVER :51 ACCEPT-CONNECT -# ?GUEST-ACCOUNT ADD USERNAME=guest-.* -# ?SESSION :51 START USER=guest-.* -# ?XSERVER :51 ACCEPT-CONNECT -# ?SESSION :51 CONNECT-XSERVER -# SESSION/XSERVER TERMINATE - -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +# Greeter starts +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|GUEST-ACCOUNT ADD USERNAME=guest-.*|SESSION :51 START USER=guest-.*|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) +# Guest session starts +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY +#?XSERVER-1 ACCEPT-CONNECT +#?GUEST-ACCOUNT ADD USERNAME=guest-.* +#?SESSION-X-1 START USER=guest-.* +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest-.* #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf index 51a6b9ac..2f643185 100644 --- a/tests/scripts/autologin-guest-logout.conf +++ b/tests/scripts/autologin-guest-logout.conf @@ -2,55 +2,51 @@ # Check automatically logs in default user # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-guest=true #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Guest account created #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION :50 START USER=guest-.* -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=guest-.* +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Logout of session -#?*SESSION :50 LOGOUT +#?*SESSION-X-0 LOGOUT # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # Guest account removed #?GUEST-ACCOUNT REMOVE USERNAME=guest-.* # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf index 330478e7..1d449618 100644 --- a/tests/scripts/autologin-guest-timeout.conf +++ b/tests/scripts/autologin-guest-timeout.conf @@ -2,9 +2,6 @@ # Check automatically logs in default user # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-guest=true autologin-user-timeout=1 @@ -12,40 +9,39 @@ autologin-user-timeout=1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Autologin timer expires -#?GREETER :50 AUTOLOGIN-TIMER-EXPIRED +#?GREETER-X-0 AUTOLOGIN-TIMER-EXPIRED # Trigger autologin -#?*GREETER :50 AUTHENTICATE-AUTOLOGIN -#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE-AUTOLOGIN +#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Guest account created #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION :50 START USER=guest-.* -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=guest-.* +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest-.* #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf index 2b987914..0095af55 100644 --- a/tests/scripts/autologin-guest.conf +++ b/tests/scripts/autologin-guest.conf @@ -2,34 +2,30 @@ # Check automatically logs in default user # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-guest=true #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Guest account created #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION :50 START USER=guest-.* -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=guest-.* +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest.* #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf index cbee827d..2b3a9700 100644 --- a/tests/scripts/autologin-in-background.conf +++ b/tests/scripts/autologin-in-background.conf @@ -2,60 +2,34 @@ # Check automatically logs in default user while keeping a greeter up # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 autologin-in-background=true #?RUNNER DAEMON-START -# The following is a gross expansion of two simultaneous sequences. One day, -# when we can specify such things in tests, they should look like the -# following: -# -# ?XSERVER :50 START -# ?XSERVER :50 INDICATE-READY -# -# Sequence 1: -# ?XSERVER :50 ACCEPT-CONNECT -# ?GREETER :50 START -# ?XSERVER :50 ACCEPT-CONNECT -# ?GREETER :50 CONNECT-XSERVER -# ?GREETER :50 CONNECT-TO-DAEMON -# ?GREETER :50 CONNECTED-TO-DAEMON -# GREETER/XSERVER TERMINATE -# -# Sequence 2 -# ?XSERVER :51 START -# ?XSERVER :51 INDICATE-READY -# ?XSERVER :51 ACCEPT-CONNECT -# ?SESSION :51 START USER=have-password1 -# ?XSERVER :51 ACCEPT-CONNECT -# ?SESSION :51 CONNECT-XSERVER -# SESSION/XSERVER TERMINATE - -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +# Greeter starts +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) +# Autologin user starts +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 START USER=have-password1 +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf index ab1d727f..62fe206d 100644 --- a/tests/scripts/autologin-invalid-session.conf +++ b/tests/scripts/autologin-invalid-session.conf @@ -2,9 +2,6 @@ # Check autologin fails if invalid session configured and returns to greeter # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 user-session=invalid @@ -12,24 +9,23 @@ user-session=invalid #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (session fails to start) # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf index d78b354d..25a8329d 100644 --- a/tests/scripts/autologin-invalid-user.conf +++ b/tests/scripts/autologin-invalid-user.conf @@ -2,33 +2,29 @@ # Check automatically logs in default user # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=invalid #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (fails to start session for invalid user) # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf index 3596ff18..ba841c7c 100644 --- a/tests/scripts/autologin-logout.conf +++ b/tests/scripts/autologin-logout.conf @@ -2,52 +2,48 @@ # Check logging out after autologin returns to greeter and doesn't autologin again # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Autologin session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Logout session -#?*SESSION :50 LOGOUT +#?*SESSION-X-0 LOGOUT # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Wait in case the greeter tries to log in immediately #?*WAIT # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf index 04771909..4407f49b 100644 --- a/tests/scripts/autologin-new-authtok.conf +++ b/tests/scripts/autologin-new-authtok.conf @@ -2,33 +2,29 @@ # Check automatic login stops if a password change is required # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=new-authtok #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (Session fails) # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf index cef39441..8f1c3f45 100644 --- a/tests/scripts/autologin-password.conf +++ b/tests/scripts/autologin-password.conf @@ -2,33 +2,29 @@ # Check automatic login stops if an account prompts for a password # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=always-password #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (Session fails) # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-previous-session.conf b/tests/scripts/autologin-previous-session.conf index 9ef4e5e5..3cad3cf5 100644 --- a/tests/scripts/autologin-previous-session.conf +++ b/tests/scripts/autologin-previous-session.conf @@ -2,29 +2,25 @@ # Check automatically logs in and picks correct session # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-session #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START NAME=alternative USER=have-session -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START NAME=alternative USER=have-session +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf index 086ae9b6..f843fc55 100644 --- a/tests/scripts/autologin-session-crash.conf +++ b/tests/scripts/autologin-session-crash.conf @@ -2,49 +2,45 @@ # Check if session crashes then returned to greeter # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Crash session -#?*SESSION :50 CRASH +#?*SESSION-X-0 CRASH # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf index 1b3d57ec..0b72aacc 100644 --- a/tests/scripts/autologin-session-error.conf +++ b/tests/scripts/autologin-session-error.conf @@ -2,43 +2,39 @@ # Check automatic login stops if an account can't open a session # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=session-error #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (Session fails) # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf index 651153ea..0e6b8f5a 100644 --- a/tests/scripts/autologin-timeout-in-background.conf +++ b/tests/scripts/autologin-timeout-in-background.conf @@ -2,9 +2,6 @@ # Check automatically logs in default user with timeout and in-background set # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 autologin-user-timeout=1 @@ -12,61 +9,33 @@ autologin-in-background=true #?RUNNER DAEMON-START -# The following is a gross expansion of two simultaneous sequences. One day, -# when we can specify such things in tests, they should look like the -# following: -# -# ?XSERVER :50 START -# ?XSERVER :50 INDICATE-READY -# -# Sequence 1: -# ?XSERVER :50 ACCEPT-CONNECT -# ?GREETER :50 START -# ?XSERVER :50 ACCEPT-CONNECT -# ?GREETER :50 CONNECT-XSERVER -# ?GREETER :50 CONNECT-TO-DAEMON -# ?GREETER :50 CONNECTED-TO-DAEMON -# ?GREETER :50 AUTOLOGIN-TIMER-EXPIRED -# ?*GREETER :50 AUTHENTICATE-AUTOLOGIN -# ?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -# ?*GREETER :50 START-SESSION -# ?GREETER :50 TERMINATE SIGNAL=15 -# -# Sequence 2 -# ?XSERVER :51 START -# ?XSERVER :51 INDICATE-READY -# ?XSERVER :51 ACCEPT-CONNECT -# ?SESSION :51 START USER=have-password1 -# ?XSERVER :51 ACCEPT-CONNECT -# ?SESSION :51 CONNECT-XSERVER -# SESSION/XSERVER TERMINATE - -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY - -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) -#?(XSERVER :50 ACCEPT-CONNECT|GREETER :50 START|XSERVER :50 ACCEPT-CONNECT|GREETER :50 CONNECT-XSERVER|GREETER :50 CONNECT-TO-DAEMON|GREETER :50 CONNECTED-TO-DAEMON|XSERVER :51 START|XSERVER :51 INDICATE-READY|XSERVER :51 ACCEPT-CONNECT|SESSION :51 START USER=have-password1|XSERVER :51 ACCEPT-CONNECT|SESSION :51 CONNECT-XSERVER) - -# ?GREETER :50 AUTOLOGIN-TIMER-EXPIRED -# ?*GREETER :50 AUTHENTICATE-AUTOLOGIN -# ?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -# ?*GREETER :50 START-SESSION -# ?GREETER :50 TERMINATE SIGNAL=15 +# Greeter starts +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON + +# Guest session starts +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 START USER=have-password1 +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER + +#?GREETER-X-0 AUTOLOGIN-TIMER-EXPIRED +#?*GREETER-X-0 AUTHENTICATE-AUTOLOGIN +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf index 429c42d7..abb99c2e 100644 --- a/tests/scripts/autologin-timeout.conf +++ b/tests/scripts/autologin-timeout.conf @@ -2,9 +2,6 @@ # Check automatically logs in default user # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 autologin-user-timeout=1 @@ -12,36 +9,35 @@ autologin-user-timeout=1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Autologin timer expires -#?GREETER :50 AUTOLOGIN-TIMER-EXPIRED +#?GREETER-X-0 AUTOLOGIN-TIMER-EXPIRED # Trigger autologin -#?*GREETER :50 AUTHENTICATE-AUTOLOGIN -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE-AUTOLOGIN +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf index 0bcf6ae9..6fc24321 100644 --- a/tests/scripts/autologin-xserver-crash.conf +++ b/tests/scripts/autologin-xserver-crash.conf @@ -2,46 +2,42 @@ # Check LightDM returns to the greeter if the X server crashes inside a session # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # XServer starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Crash X server -#?*XSERVER :50 CRASH +#?*XSERVER-0 CRASH # User session is terminated -#?SESSION :50 TERMINATE SIGNAL=15 +#?SESSION-X-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf index bc32b100..10c5388c 100644 --- a/tests/scripts/autologin.conf +++ b/tests/scripts/autologin.conf @@ -2,29 +2,25 @@ # Check automatically logs in default user # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf index ccd5eb40..27213175 100644 --- a/tests/scripts/cancel-authentication.conf +++ b/tests/scripts/cancel-authentication.conf @@ -2,39 +2,35 @@ # Check can cancel authentication # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Start authentication -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" # Cancel authentication -#?*GREETER :50 CANCEL-AUTHENTICATION +#?*GREETER-X-0 CANCEL-AUTHENTICATION # Start new authentication -#?*GREETER :50 AUTHENTICATE USERNAME=have-password2 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password2 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf index d3860a19..f2ec30e5 100644 --- a/tests/scripts/change-authentication.conf +++ b/tests/scripts/change-authentication.conf @@ -2,37 +2,33 @@ # Check can change authentication # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Start authentication -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" # Change user authentication -#?*GREETER :50 AUTHENTICATE USERNAME=have-password2 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password2 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/console-kit.conf b/tests/scripts/console-kit.conf index 3ccd09a1..38eaa9ea 100644 --- a/tests/scripts/console-kit.conf +++ b/tests/scripts/console-kit.conf @@ -5,33 +5,29 @@ [test-runner-config] disable-login1=true -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Check environment variable -#?*SESSION :50 READ-ENV NAME=XDG_SESSION_COOKIE -#?SESSION :50 READ-ENV NAME=XDG_SESSION_COOKIE VALUE=ck-cookie-x:50 +#?*SESSION-X-0 READ-ENV NAME=XDG_SESSION_COOKIE +#?SESSION-X-0 READ-ENV NAME=XDG_SESSION_COOKIE VALUE=ck-cookie-x:0 # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf index 259d7265..84cc3a3d 100644 --- a/tests/scripts/crash-authenticate.conf +++ b/tests/scripts/crash-authenticate.conf @@ -2,33 +2,29 @@ # Check authentication crash on autologin is handled # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=crash-authenticate #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (authentication crashes) # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf index 06dcb352..fe1c2458 100644 --- a/tests/scripts/cred-error.conf +++ b/tests/scripts/cred-error.conf @@ -2,43 +2,39 @@ # Check automatic login stops if an account can't establish credentials # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=cred-error #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (Session fails) # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf index b55b86de..99e3bb42 100644 --- a/tests/scripts/cred-expired.conf +++ b/tests/scripts/cred-expired.conf @@ -2,43 +2,39 @@ # Check automatic login stops if an account has expired credentials # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=cred-expired #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (Session fails) # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf index 0ead3385..2cd0e088 100644 --- a/tests/scripts/cred-unavail.conf +++ b/tests/scripts/cred-unavail.conf @@ -2,43 +2,39 @@ # Check automatic login stops if an account can't access credentials # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=cred-unavail #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (Session fails) # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/default-keyboard-layout.conf b/tests/scripts/default-keyboard-layout.conf deleted file mode 100644 index 3a560844..00000000 --- a/tests/scripts/default-keyboard-layout.conf +++ /dev/null @@ -1,38 +0,0 @@ -# -# Check returns correct layout for a user -# - -[LightDM] -minimum-display-number=50 - -[test-xserver-config] -keyboard-layout=ara -keyboard-variant=azerty - -#?RUNNER DAEMON-START - -# X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY - -# LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT - -# Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON - -# Correct layout is found -#?*GREETER :50 LOG-LAYOUT -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 LOG-LAYOUT LAYOUT='ara azerty' - -# Cleanup -#?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf index caf42ffd..8ba7d6a4 100644 --- a/tests/scripts/denied.conf +++ b/tests/scripts/denied.conf @@ -2,33 +2,29 @@ # Check automatic login stops if an account is denied access # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=denied #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (Session fails) # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf index b04d6379..b08e5c0e 100644 --- a/tests/scripts/expired.conf +++ b/tests/scripts/expired.conf @@ -2,33 +2,29 @@ # Check automatic login stops if an account is expired # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=expired #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (Session fails) # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf index c2c4a1f8..5e131d7a 100644 --- a/tests/scripts/greeter-fail-start.conf +++ b/tests/scripts/greeter-fail-start.conf @@ -2,27 +2,24 @@ # Check that LightDM quits when the greeter fails to start # -[LightDM] -minimum-display-number=50 - [test-greeter-config] return-value=1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter fails to start -#?GREETER :50 START -#?GREETER :50 EXIT CODE=1 +#?GREETER-X-0 START +#?GREETER-X-0 EXIT CODE=1 # X server stopped -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # Daemon stops with error #?RUNNER DAEMON-EXIT STATUS=1 diff --git a/tests/scripts/greeter-not-installed.conf b/tests/scripts/greeter-not-installed.conf index 7cf0e8fe..b0590713 100644 --- a/tests/scripts/greeter-not-installed.conf +++ b/tests/scripts/greeter-not-installed.conf @@ -2,25 +2,22 @@ # Check that LightDM quits when the greeter does not exist # -[LightDM] -minimum-display-number=50 - [test-greeter-config] return-value=1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Invalid greeter attempted, fails to start # X server stopped -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # Daemon stops with error #?RUNNER DAEMON-EXIT STATUS=1 diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf index 84480222..251b1bc6 100644 --- a/tests/scripts/greeter-xserver-crash.conf +++ b/tests/scripts/greeter-xserver-crash.conf @@ -2,48 +2,44 @@ # Check X server crashing while running greeter returns to the greeter # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Crash X server -#?*XSERVER :50 CRASH +#?*XSERVER-0 CRASH # Greeter quits -#?GREETER :50 TERMINATE SIGNAL=15 +#?GREETER-X-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/group-membership.conf b/tests/scripts/group-membership.conf index 70f5afd3..82873727 100644 --- a/tests/scripts/group-membership.conf +++ b/tests/scripts/group-membership.conf @@ -2,33 +2,29 @@ # Check group membership is correctly set up # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=group-member #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=group-member -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=group-member +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Check we belong to the group for our user and the special group set by PAM -#?*SESSION :50 LIST-GROUPS -#?SESSION :50 LIST-GROUPS GROUPS=group-member,test-group +#?*SESSION-X-0 LIST-GROUPS +#?SESSION-X-0 LIST-GROUPS GROUPS=group-member,test-group # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/home-dir-on-authenticate.conf b/tests/scripts/home-dir-on-authenticate.conf index 5f3e49ab..f440bfe2 100644 --- a/tests/scripts/home-dir-on-authenticate.conf +++ b/tests/scripts/home-dir-on-authenticate.conf @@ -2,29 +2,25 @@ # Check works for users who have their home directory created after authentication # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=mount-home-dir #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=mount-home-dir -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=mount-home-dir +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/home-dir-on-session.conf b/tests/scripts/home-dir-on-session.conf index 0431bf19..cdd3254e 100644 --- a/tests/scripts/home-dir-on-session.conf +++ b/tests/scripts/home-dir-on-session.conf @@ -2,29 +2,25 @@ # Check works for users who have their home directory created when the session is opened # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=make-home-dir #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=make-home-dir -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=make-home-dir +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf index 0869052b..d7e83611 100644 --- a/tests/scripts/keyboard-layout.conf +++ b/tests/scripts/keyboard-layout.conf @@ -2,37 +2,33 @@ # Check returns correct layout for a user # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Correct layout is found -#?*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' +#?*GREETER-X-0 LOG-LAYOUT USERNAME=have-layout +#?GREETER-X-0 LOG-LAYOUT USERNAME=have-layout LAYOUT='us' +#?*GREETER-X-0 LOG-LAYOUT USERNAME=have-layouts +#?GREETER-X-0 LOG-LAYOUT USERNAME=have-layouts LAYOUT='fr oss' +#?*GREETER-X-0 LOG-LAYOUTS USERNAME=have-layouts +#?GREETER-X-0 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='fr oss' +#?GREETER-X-0 LOG-LAYOUTS USERNAME=have-layouts LAYOUT='ru' # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/keyboard-variants.conf b/tests/scripts/keyboard-variants.conf deleted file mode 100644 index 46f4fb2c..00000000 --- a/tests/scripts/keyboard-variants.conf +++ /dev/null @@ -1,50 +0,0 @@ -# -# Check returns variants as well as normal layouts -# - -[LightDM] -minimum-display-number=50 - -#?RUNNER DAEMON-START - -# X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY - -# LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT - -# Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON - -# Correct layouts are found -#?*GREETER :50 LOG-VARIANTS LAYOUT=fr -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 LOG-VARIANTS LAYOUT='fr' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr nodeadkeys' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr sundeadkeys' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr oss' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr oss_latin9' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr oss_nodeadkeys' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr oss_sundeadkeys' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr latin9' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr latin9_nodeadkeys' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr latin9_sundeadkeys' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr bepo' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr bepo_latin9' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr dvorak' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr mac' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr bre' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr oci' -#?GREETER :50 LOG-VARIANTS LAYOUT='fr geo' - -# Cleanup -#?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf index 05514342..195dcdc8 100644 --- a/tests/scripts/language-no-accounts-service.conf +++ b/tests/scripts/language-no-accounts-service.conf @@ -5,32 +5,28 @@ [test-runner-config] disable-accounts-service=true -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Correct layout is found -#?*GREETER :50 LOG-LANGUAGE USERNAME=have-language -#?GREETER :50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU.utf8 +#?*GREETER-X-0 LOG-LANGUAGE USERNAME=have-language +#?GREETER-X-0 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU.utf8 # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf index f48f5e3b..e5dc220a 100644 --- a/tests/scripts/language.conf +++ b/tests/scripts/language.conf @@ -2,32 +2,28 @@ # Check returns correct language for a user # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Correct layout is found -#?*GREETER :50 LOG-LANGUAGE USERNAME=have-language -#?GREETER :50 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU +#?*GREETER-X-0 LOG-LANGUAGE USERNAME=have-language +#?GREETER-X-0 LOG-LANGUAGE USERNAME=have-language LANGUAGE=en_AU # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf index ad9a7684..de3e2baa 100644 --- a/tests/scripts/lock-seat-return-session.conf +++ b/tests/scripts/lock-seat-return-session.conf @@ -2,60 +2,56 @@ # Check can lock a seat from D-Bus and can return to it # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Lock the seat -#?*SESSION :50 LOCK-SEAT -#?SESSION :50 LOCK-SEAT +#?*SESSION-X-0 LOCK-SEAT +#?SESSION-X-0 LOCK-SEAT # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON -#?GREETER :51 LOCK-HINT +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON +#?GREETER-X-1 LOCK-HINT # Login as existing user -#?*GREETER :51 AUTHENTICATE USERNAME=have-password1 -#?GREETER :51 SHOW-PROMPT TEXT="Password:" -#?*GREETER :51 RESPOND TEXT="password" -#?GREETER :51 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :51 START-SESSION +#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-1 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-1 RESPOND TEXT="password" +#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-1 START-SESSION # Greeter and X server stop -#?GREETER :51 TERMINATE SIGNAL=15 -#?XSERVER :51 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf index fd9fece0..1ffc41ed 100644 --- a/tests/scripts/lock-seat.conf +++ b/tests/scripts/lock-seat.conf @@ -2,50 +2,46 @@ # Check can lock a seat from D-Bus # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Lock the seat -#?*SESSION :50 LOCK-SEAT -#?SESSION :50 LOCK-SEAT +#?*SESSION-X-0 LOCK-SEAT +#?SESSION-X-0 LOCK-SEAT # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON -#?GREETER :51 LOCK-HINT +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON +#?GREETER-X-1 LOCK-HINT # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf index 90b31a12..87c2810b 100644 --- a/tests/scripts/lock-session-no-password.conf +++ b/tests/scripts/lock-session-no-password.conf @@ -2,51 +2,47 @@ # Check can lock a session from D-Bus. The session has no password so check it doesn't automatically log back in # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=no-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=no-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=no-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Lock the session -#?*SESSION :50 LOCK-SESSION -#?SESSION :50 LOCK-SESSION +#?*SESSION-X-0 LOCK-SESSION +#?SESSION-X-0 LOCK-SESSION # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts with session user selected -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON -#?GREETER :51 SELECT-USER-HINT USERNAME=no-password1 -#?GREETER :51 LOCK-HINT +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON +#?GREETER-X-1 SELECT-USER-HINT USERNAME=no-password1 +#?GREETER-X-1 LOCK-HINT # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf index 4580b995..08d29d17 100644 --- a/tests/scripts/lock-session-return-session.conf +++ b/tests/scripts/lock-session-return-session.conf @@ -2,60 +2,56 @@ # Check can lock a session from D-Bus and can return to it # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Lock the session -#?*SESSION :50 LOCK-SESSION -#?SESSION :50 LOCK-SESSION +#?*SESSION-X-0 LOCK-SESSION +#?SESSION-X-0 LOCK-SESSION # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts with session user selected -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON -#?GREETER :51 SELECT-USER-HINT USERNAME=have-password1 -#?GREETER :51 LOCK-HINT +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON +#?GREETER-X-1 SELECT-USER-HINT USERNAME=have-password1 +#?GREETER-X-1 LOCK-HINT # Login as existing user -#?*GREETER :51 AUTHENTICATE USERNAME=have-password1 -#?GREETER :51 SHOW-PROMPT TEXT="Password:" -#?*GREETER :51 RESPOND TEXT="password" -#?GREETER :51 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :51 START-SESSION +#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-1 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-1 RESPOND TEXT="password" +#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-1 START-SESSION # Greeter and X server stop -#?GREETER :51 TERMINATE SIGNAL=15 -#?XSERVER :51 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf index e95bc1d6..c832110b 100644 --- a/tests/scripts/lock-session.conf +++ b/tests/scripts/lock-session.conf @@ -2,51 +2,47 @@ # Check can lock a session from D-Bus # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Lock the session -#?*SESSION :50 LOCK-SESSION -#?SESSION :50 LOCK-SESSION +#?*SESSION-X-0 LOCK-SESSION +#?SESSION-X-0 LOCK-SESSION # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts with session user selected -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON -#?GREETER :51 SELECT-USER-HINT USERNAME=have-password1 -#?GREETER :51 LOCK-HINT +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON +#?GREETER-X-1 SELECT-USER-HINT USERNAME=have-password1 +#?GREETER-X-1 LOCK-HINT # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf index 2673a4a9..f12a11f5 100644 --- a/tests/scripts/login-crash-authenticate.conf +++ b/tests/scripts/login-crash-authenticate.conf @@ -2,33 +2,29 @@ # Check returned to greeter when authentication crashes # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Attempt to login, but authentication crashes -#?*GREETER :50 AUTHENTICATE USERNAME=crash-authenticate -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=crash-authenticate AUTHENTICATED=FALSE +#?*GREETER-X-0 AUTHENTICATE USERNAME=crash-authenticate +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=crash-authenticate AUTHENTICATED=FALSE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf index 762f944c..cb53acff 100644 --- a/tests/scripts/login-guest-disabled.conf +++ b/tests/scripts/login-guest-disabled.conf @@ -2,35 +2,31 @@ # Check can't login to guest if account disabled # -[LightDM] -minimum-display-number=50 - [SeatDefaults] allow-guest=false #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Login as guest -#?*GREETER :50 AUTHENTICATE-GUEST -#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE +#?*GREETER-X-0 AUTHENTICATE-GUEST +#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf index dc6f0b57..4d15aed0 100644 --- a/tests/scripts/login-guest-fail-setup-script.conf +++ b/tests/scripts/login-guest-fail-setup-script.conf @@ -4,52 +4,50 @@ [LightDM] guest-account-script=false -minimum-display-number=50 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Login as guest -#?*GREETER :50 AUTHENTICATE-GUEST -#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE-GUEST +#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # (guest account attempts to start and fails) # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf index 1dcf3ceb..4be92480 100644 --- a/tests/scripts/login-guest-logout.conf +++ b/tests/scripts/login-guest-logout.conf @@ -2,65 +2,61 @@ # Check automatically logs in default user # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log in -#?*GREETER :50 AUTHENTICATE-GUEST -#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE-GUEST +#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Guest account created #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION :50 START USER=guest-.* -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=guest-.* +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Logout of session -#?*SESSION :50 LOGOUT +#?*SESSION-X-0 LOGOUT # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # Guest account removed #?GUEST-ACCOUNT REMOVE USERNAME=guest-.* # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf index 38f600ce..cdad799b 100644 --- a/tests/scripts/login-guest-no-setup-script.conf +++ b/tests/scripts/login-guest-no-setup-script.conf @@ -4,31 +4,29 @@ [LightDM] guest-account-script= -minimum-display-number=50 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Login as guest -#?*GREETER :50 AUTHENTICATE-GUEST -#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE +#?*GREETER-X-0 AUTHENTICATE-GUEST +#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf index 4e46af10..020ddcaf 100644 --- a/tests/scripts/login-guest.conf +++ b/tests/scripts/login-guest.conf @@ -2,43 +2,39 @@ # Check can login as guest (not prompted for password) # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Login as guest -#?*GREETER :50 AUTHENTICATE-GUEST -#?GREETER :50 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE-GUEST +#?GREETER-X-0 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Guest account created #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION :50 START USER=guest-.* -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=guest-.* +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest-.* #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf index 8df67e52..d4b0b38d 100644 --- a/tests/scripts/login-info-prompt.conf +++ b/tests/scripts/login-info-prompt.conf @@ -2,37 +2,33 @@ # Check a PAM informational message on login is passed to a greeter # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log into account and see an informational prompt -#?*GREETER :50 AUTHENTICATE USERNAME=info-prompt -#?GREETER :50 SHOW-MESSAGE TEXT="Welcome to LightDM" -#?GREETER :50 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 AUTHENTICATE USERNAME=info-prompt +#?GREETER-X-0 SHOW-MESSAGE TEXT="Welcome to LightDM" +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" # Respond with password and check response is correctly handled -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=info-prompt AUTHENTICATED=TRUE +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=info-prompt AUTHENTICATED=TRUE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf index 11eae07e..058ea64d 100644 --- a/tests/scripts/login-invalid-session.conf +++ b/tests/scripts/login-invalid-session.conf @@ -2,53 +2,49 @@ # Check can login # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # 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=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION SESSION=invalid -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION SESSION=invalid +#?GREETER-X-0 TERMINATE SIGNAL=15 # X server stops, the session is invalid -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf index 485be17d..04ba79be 100644 --- a/tests/scripts/login-invalid-user.conf +++ b/tests/scripts/login-invalid-user.conf @@ -2,34 +2,30 @@ # Check can't login with invalid user (but still prompted for password) # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Login as invalid user -#?*GREETER :50 AUTHENTICATE USERNAME=notauser -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=notauser AUTHENTICATED=FALSE +#?*GREETER-X-0 AUTHENTICATE USERNAME=notauser +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=notauser AUTHENTICATED=FALSE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf index db0f1b36..5b50d7fa 100644 --- a/tests/scripts/login-logout.conf +++ b/tests/scripts/login-logout.conf @@ -2,61 +2,57 @@ # Check logging out returns to the greeter # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log in -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Logout session -#?*SESSION :50 LOGOUT +#?*SESSION-X-0 LOGOUT # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf index 1eaf1dda..74ac5c95 100644 --- a/tests/scripts/login-long-password.conf +++ b/tests/scripts/login-long-password.conf @@ -2,34 +2,30 @@ # Check can handle very long password being provided # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log in with a very long username -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf index 2ae4cd14..85b77271 100644 --- a/tests/scripts/login-long-username.conf +++ b/tests/scripts/login-long-username.conf @@ -2,34 +2,30 @@ # Check can handle very long username being provided # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log in with a very long username -#?*GREETER :50 AUTHENTICATE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 AUTHENTICATED=FALSE +#?*GREETER-X-0 AUTHENTICATE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 AUTHENTICATED=FALSE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf index dde24b4c..9de99876 100644 --- a/tests/scripts/login-manual-previous-session.conf +++ b/tests/scripts/login-manual-previous-session.conf @@ -2,41 +2,37 @@ # Check when logging in manually the previous session is restored # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # 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="have-session" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE +#?GREETER-X-0 SHOW-PROMPT TEXT="login:" +#?*GREETER-X-0 RESPOND TEXT="have-session" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START NAME=alternative USER=have-session -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START NAME=alternative USER=have-session +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf index dd83c35e..6baa8052 100644 --- a/tests/scripts/login-manual.conf +++ b/tests/scripts/login-manual.conf @@ -2,43 +2,39 @@ # Check can login without a username, and is prompted for one # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Login as have-password1, but let lightdm prompt for a username -#?*GREETER :50 AUTHENTICATE -#?GREETER :50 SHOW-PROMPT TEXT="login:" -#?*GREETER :50 RESPOND TEXT="have-password1" -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE +#?GREETER-X-0 SHOW-PROMPT TEXT="login:" +#?*GREETER-X-0 RESPOND TEXT="have-password1" +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf index 1baf5eeb..469c4add 100644 --- a/tests/scripts/login-multi-info-prompt.conf +++ b/tests/scripts/login-multi-info-prompt.conf @@ -2,39 +2,35 @@ # Check multiple PAM informational messages on login are passed to a greeter # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log into account and see an informational prompt -#?*GREETER :50 AUTHENTICATE USERNAME=multi-info-prompt -#?GREETER :50 SHOW-MESSAGE TEXT="Welcome to LightDM" -#?GREETER :50 SHOW-MESSAGE TEXT="This is an error" -#?GREETER :50 SHOW-MESSAGE TEXT="You should have seen three messages" -#?GREETER :50 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 AUTHENTICATE USERNAME=multi-info-prompt +#?GREETER-X-0 SHOW-MESSAGE TEXT="Welcome to LightDM" +#?GREETER-X-0 SHOW-MESSAGE TEXT="This is an error" +#?GREETER-X-0 SHOW-MESSAGE TEXT="You should have seen three messages" +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" # Respond with password and check response is correctly handled -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=multi-info-prompt AUTHENTICATED=TRUE +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=multi-info-prompt AUTHENTICATED=TRUE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf index ed24986b..6178eeb3 100644 --- a/tests/scripts/login-multi-prompt.conf +++ b/tests/scripts/login-multi-prompt.conf @@ -2,38 +2,34 @@ # Check multiple PAM informational messages on login are passed to a greeter # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log into account and see an informational prompt -#?*GREETER :50 AUTHENTICATE USERNAME=multi-prompt -#?GREETER :50 SHOW-PROMPT TEXT="Favorite Color:" -#?GREETER :50 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 AUTHENTICATE USERNAME=multi-prompt +#?GREETER-X-0 SHOW-PROMPT TEXT="Favorite Color:" +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" # Respond with password and check response is correctly handled -#?*GREETER :50 RESPOND TEXT="blue" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=multi-prompt AUTHENTICATED=TRUE +#?*GREETER-X-0 RESPOND TEXT="blue" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=multi-prompt AUTHENTICATED=TRUE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf index abb36445..af7ce220 100644 --- a/tests/scripts/login-new-authtok.conf +++ b/tests/scripts/login-new-authtok.conf @@ -2,41 +2,37 @@ # Check prompted to change password # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log into account that requires as password change -#?*GREETER :50 AUTHENTICATE USERNAME=new-authtok -#?GREETER :50 SHOW-PROMPT TEXT="Enter new password:" -#?*GREETER :50 RESPOND TEXT="New password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=new-authtok +#?GREETER-X-0 SHOW-PROMPT TEXT="Enter new password:" +#?*GREETER-X-0 RESPOND TEXT="New password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=new-authtok -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=new-authtok +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf index 314bed75..ab4aa81d 100644 --- a/tests/scripts/login-no-password.conf +++ b/tests/scripts/login-no-password.conf @@ -2,39 +2,35 @@ # Check can login without password for accounts that do not have a password # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # 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 +#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1 +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=no-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=no-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf index 5010b038..de0e4371 100644 --- a/tests/scripts/login-pam.conf +++ b/tests/scripts/login-pam.conf @@ -2,43 +2,39 @@ # Check we handle conversations during each PAM method # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log into account with a password -#?*GREETER :50 AUTHENTICATE USERNAME=log-pam -#?GREETER :50 SHOW-MESSAGE TEXT="pam_authenticate" -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 SHOW-MESSAGE TEXT="pam_acct_mgmt" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=log-pam AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=log-pam +#?GREETER-X-0 SHOW-MESSAGE TEXT="pam_authenticate" +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 SHOW-MESSAGE TEXT="pam_acct_mgmt" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=log-pam AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=log-pam -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=log-pam +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf index 92f7240d..ae50986a 100644 --- a/tests/scripts/login-pick-session.conf +++ b/tests/scripts/login-pick-session.conf @@ -2,41 +2,37 @@ # Check can login and pick an alternative session # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # 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=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION SESSION=alternative -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION SESSION=alternative +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START NAME=alternative USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START NAME=alternative USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf index aaa641e2..7caf0a8c 100644 --- a/tests/scripts/login-previous-session.conf +++ b/tests/scripts/login-previous-session.conf @@ -2,39 +2,35 @@ # Check when logging in the previous session is loaded # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # 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 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-session +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-session AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START NAME=alternative USER=have-session -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START NAME=alternative USER=have-session +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf index b24a89f8..44f48ceb 100644 --- a/tests/scripts/login-remote-session.conf +++ b/tests/scripts/login-remote-session.conf @@ -2,49 +2,45 @@ # Check can login without a username, and is prompted for one # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Start remote authentication -#?*GREETER :50 AUTHENTICATE-REMOTE SESSION=test-remote +#?*GREETER-X-0 AUTHENTICATE-REMOTE SESSION=test-remote # Guest account created #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Get remote credentials -#?GREETER :50 SHOW-PROMPT TEXT="remote-login:" -#?*GREETER :50 RESPOND TEXT="remote-user" -#?GREETER :50 SHOW-PROMPT TEXT="remote-password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=guest-.* AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?GREETER-X-0 SHOW-PROMPT TEXT="remote-login:" +#?*GREETER-X-0 RESPOND TEXT="remote-user" +#?GREETER-X-0 SHOW-PROMPT TEXT="remote-password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=guest-.* AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=guest-.* -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=guest-.* +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest-.* #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf index 84c8b77e..935673f9 100644 --- a/tests/scripts/login-session-crash.conf +++ b/tests/scripts/login-session-crash.conf @@ -2,61 +2,57 @@ # Check if session crashes then returned to greeter # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # 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=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Crash session -#?*SESSION :50 CRASH +#?*SESSION-X-0 CRASH # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf index 04791dde..762e0bb7 100644 --- a/tests/scripts/login-two-factor.conf +++ b/tests/scripts/login-two-factor.conf @@ -2,36 +2,32 @@ # Check can login with two factor # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log into account with a password -#?*GREETER :50 AUTHENTICATE USERNAME=two-factor -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 SHOW-PROMPT TEXT="OTP:" -#?*GREETER :50 RESPOND TEXT="otp" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=two-factor AUTHENTICATED=TRUE +#?*GREETER-X-0 AUTHENTICATE USERNAME=two-factor +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 SHOW-PROMPT TEXT="OTP:" +#?*GREETER-X-0 RESPOND TEXT="otp" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=two-factor AUTHENTICATED=TRUE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf index 56c1f874..27bc938c 100644 --- a/tests/scripts/login-wrong-password.conf +++ b/tests/scripts/login-wrong-password.conf @@ -2,35 +2,31 @@ # Check can't login with an invalid password # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Login with invalid password -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="rubbish" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="rubbish" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=FALSE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf index fb382883..2c18b145 100644 --- a/tests/scripts/login-xserver-crash.conf +++ b/tests/scripts/login-xserver-crash.conf @@ -2,58 +2,54 @@ # Check LightDM returns to the greeter if the X server crashes inside a session # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # XServer starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # 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=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Crash X server -#?*XSERVER :50 CRASH +#?*XSERVER-0 CRASH # User session is terminated -#?SESSION :50 TERMINATE SIGNAL=15 +#?SESSION-X-0 TERMINATE SIGNAL=15 # X server restarts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf index ba3120b2..4b2aefbc 100644 --- a/tests/scripts/login.conf +++ b/tests/scripts/login.conf @@ -2,41 +2,37 @@ # Check can login # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # 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=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/no-accounts-service.conf b/tests/scripts/no-accounts-service.conf index e79d2e7b..f6653f5c 100644 --- a/tests/scripts/no-accounts-service.conf +++ b/tests/scripts/no-accounts-service.conf @@ -5,29 +5,25 @@ [test-runner-config] disable-accounts-service=true -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf index 89f71b19..1b431b47 100644 --- a/tests/scripts/no-config.conf +++ b/tests/scripts/no-config.conf @@ -8,23 +8,21 @@ have-config=false #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER :.* START -#?XSERVER :.* INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :.* ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :.* START -#?XSERVER :.* ACCEPT-CONNECT -#?GREETER :.* CONNECT-XSERVER -#?GREETER :.* CONNECT-TO-DAEMON -#?GREETER :.* CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :.* TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15) -#?(GREETER :.* TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 - diff --git a/tests/scripts/no-console-kit-or-login1.conf b/tests/scripts/no-console-kit-or-login1.conf index c6c045d0..07d80c77 100644 --- a/tests/scripts/no-console-kit-or-login1.conf +++ b/tests/scripts/no-console-kit-or-login1.conf @@ -6,29 +6,25 @@ disable-console-kit=true disable-login1=true -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/no-console-kit.conf b/tests/scripts/no-console-kit.conf index d778a89a..8ce8c5a2 100644 --- a/tests/scripts/no-console-kit.conf +++ b/tests/scripts/no-console-kit.conf @@ -5,29 +5,25 @@ [test-runner-config] disable-console-kit=true -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/no-keyboard-layout.conf b/tests/scripts/no-keyboard-layout.conf index 645ce21e..d6a871f8 100644 --- a/tests/scripts/no-keyboard-layout.conf +++ b/tests/scripts/no-keyboard-layout.conf @@ -2,32 +2,28 @@ # Check handles user that has no keyboard layout # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Correct layout is found -#?*GREETER :50 LOG-LAYOUT USERNAME=have-password1 -#?GREETER :50 LOG-LAYOUT USERNAME=have-password1 LAYOUT='' +#?*GREETER-X-0 LOG-LAYOUT USERNAME=have-password1 +#?GREETER-X-0 LOG-LAYOUT USERNAME=have-password1 LAYOUT='' # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf index b50957c4..492922e7 100644 --- a/tests/scripts/no-language.conf +++ b/tests/scripts/no-language.conf @@ -2,32 +2,28 @@ # Check handles user that has no language set # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Correct layout is found -#?*GREETER :50 LOG-LANGUAGE USERNAME=have-password1 -#?GREETER :50 LOG-LANGUAGE USERNAME=have-password1 LANGUAGE= +#?*GREETER-X-0 LOG-LANGUAGE USERNAME=have-password1 +#?GREETER-X-0 LOG-LANGUAGE USERNAME=have-password1 LANGUAGE= # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/no-login1.conf b/tests/scripts/no-login1.conf index 2447b8ba..e908c817 100644 --- a/tests/scripts/no-login1.conf +++ b/tests/scripts/no-login1.conf @@ -5,29 +5,25 @@ [test-runner-config] disable-login1=true -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf index 13dad3c1..cee5ee93 100644 --- a/tests/scripts/open-file-descriptors.conf +++ b/tests/scripts/open-file-descriptors.conf @@ -3,45 +3,41 @@ # Use a greeter so its file descriptors are around at the time the session starts. # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log in -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Check file descriptors -#?*SESSION :50 LIST-UNKNOWN-FILE-DESCRIPTORS -#?SESSION :50 LIST-UNKNOWN-FILE-DESCRIPTORS FDS= +#?*SESSION-X-0 LIST-UNKNOWN-FILE-DESCRIPTORS +#?SESSION-X-0 LIST-UNKNOWN-FILE-DESCRIPTORS FDS= # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/pam.conf b/tests/scripts/pam.conf index 64078dc9..35655ef3 100644 --- a/tests/scripts/pam.conf +++ b/tests/scripts/pam.conf @@ -2,29 +2,25 @@ # Check we handle conversations during each PAM method # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=log-pam #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=log-pam -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=log-pam +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf index f776189f..905b3d20 100644 --- a/tests/scripts/plymouth-active-vt.conf +++ b/tests/scripts/plymouth-active-vt.conf @@ -2,9 +2,6 @@ # Check Plymouth quits when X server is started. Plymouth is on an active VT so it handshakes with the X server. # -[LightDM] -minimum-display-number=50 - [test-plymouth-config] enabled=true has-active-vt=true @@ -18,25 +15,24 @@ active=true #?PLYMOUTH DEACTIVATE # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # Plymouth quits but keeps image in framebuffer #?PLYMOUTH QUIT RETAIN-SPLASH=TRUE # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf index c72adb22..017cdcce 100644 --- a/tests/scripts/plymouth-inactive-vt.conf +++ b/tests/scripts/plymouth-inactive-vt.conf @@ -2,9 +2,6 @@ # Check Plymouth quits when X server is started. Plymouth is on an inactive VT so it quits immediately. # -[LightDM] -minimum-display-number=50 - [test-plymouth-config] enabled=true active=true @@ -12,26 +9,24 @@ active=true #?RUNNER DAEMON-START # Check if Plymouth is running, then start X server -# The Plymouth interaction and X server interaction can happen at the same time -#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) -#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) -#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) -#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) -#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) +#?PLYMOUTH PING ACTIVE=TRUE +#?PLYMOUTH HAS-ACTIVE-VT=FALSE +#?PLYMOUTH QUIT RETAIN-SPLASH=FALSE +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/plymouth-no-seat.conf b/tests/scripts/plymouth-no-seat.conf index 3cd081f3..5e5d5d25 100644 --- a/tests/scripts/plymouth-no-seat.conf +++ b/tests/scripts/plymouth-no-seat.conf @@ -4,7 +4,6 @@ [LightDM] start-default-seat=false -minimum-display-number=50 [test-plymouth-config] enabled=true diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf index 9d10428c..e08f7074 100644 --- a/tests/scripts/power-no-console-kit.conf +++ b/tests/scripts/power-no-console-kit.conf @@ -5,64 +5,60 @@ [test-runner-config] disable-console-kit=true -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # See if can suspend -#?*GREETER :50 GET-CAN-SUSPEND +#?*GREETER-X-0 GET-CAN-SUSPEND #?LOGIN1 CAN-SUSPEND -#?GREETER :50 CAN-SUSPEND ALLOWED=TRUE +#?GREETER-X-0 CAN-SUSPEND ALLOWED=TRUE # Suspend -#?*GREETER :50 SUSPEND +#?*GREETER-X-0 SUSPEND #?LOGIN1 SUSPEND # See if can hibernate -#?*GREETER :50 GET-CAN-HIBERNATE +#?*GREETER-X-0 GET-CAN-HIBERNATE #?LOGIN1 CAN-HIBERNATE -#?GREETER :50 CAN-HIBERNATE ALLOWED=TRUE +#?GREETER-X-0 CAN-HIBERNATE ALLOWED=TRUE # Hibernate -#?*GREETER :50 HIBERNATE +#?*GREETER-X-0 HIBERNATE #?LOGIN1 HIBERNATE # See if can restart -#?*GREETER :50 GET-CAN-RESTART +#?*GREETER-X-0 GET-CAN-RESTART #?LOGIN1 CAN-REBOOT -#?GREETER :50 CAN-RESTART ALLOWED=TRUE +#?GREETER-X-0 CAN-RESTART ALLOWED=TRUE # Restart -#?*GREETER :50 RESTART +#?*GREETER-X-0 RESTART #?LOGIN1 REBOOT # See if can shutdown -#?*GREETER :50 GET-CAN-SHUTDOWN +#?*GREETER-X-0 GET-CAN-SHUTDOWN #?LOGIN1 CAN-POWER-OFF -#?GREETER :50 CAN-SHUTDOWN ALLOWED=TRUE +#?GREETER-X-0 CAN-SHUTDOWN ALLOWED=TRUE # Shutdown -#?*GREETER :50 SHUTDOWN +#?*GREETER-X-0 SHUTDOWN #?LOGIN1 POWER-OFF # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf index 03812940..ed996d3c 100644 --- a/tests/scripts/power-no-login1.conf +++ b/tests/scripts/power-no-login1.conf @@ -5,64 +5,60 @@ [test-runner-config] disable-login1=true -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # See if can suspend -#?*GREETER :50 GET-CAN-SUSPEND +#?*GREETER-X-0 GET-CAN-SUSPEND #?UPOWER SUSPEND-ALLOWED -#?GREETER :50 CAN-SUSPEND ALLOWED=TRUE +#?GREETER-X-0 CAN-SUSPEND ALLOWED=TRUE # Suspend -#?*GREETER :50 SUSPEND +#?*GREETER-X-0 SUSPEND #?UPOWER SUSPEND # See if can hibernate -#?*GREETER :50 GET-CAN-HIBERNATE +#?*GREETER-X-0 GET-CAN-HIBERNATE #?UPOWER HIBERNATE-ALLOWED -#?GREETER :50 CAN-HIBERNATE ALLOWED=TRUE +#?GREETER-X-0 CAN-HIBERNATE ALLOWED=TRUE # Hibernate -#?*GREETER :50 HIBERNATE +#?*GREETER-X-0 HIBERNATE #?UPOWER HIBERNATE # See if can restart -#?*GREETER :50 GET-CAN-RESTART +#?*GREETER-X-0 GET-CAN-RESTART #?CONSOLE-KIT CAN-RESTART -#?GREETER :50 CAN-RESTART ALLOWED=TRUE +#?GREETER-X-0 CAN-RESTART ALLOWED=TRUE # Restart -#?*GREETER :50 RESTART +#?*GREETER-X-0 RESTART #?CONSOLE-KIT RESTART # See if can shutdown -#?*GREETER :50 GET-CAN-SHUTDOWN +#?*GREETER-X-0 GET-CAN-SHUTDOWN #?CONSOLE-KIT CAN-STOP -#?GREETER :50 CAN-SHUTDOWN ALLOWED=TRUE +#?GREETER-X-0 CAN-SHUTDOWN ALLOWED=TRUE # Shutdown -#?*GREETER :50 SHUTDOWN +#?*GREETER-X-0 SHUTDOWN #?CONSOLE-KIT STOP # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/power-no-services.conf b/tests/scripts/power-no-services.conf index d2fb6285..613f2a3e 100644 --- a/tests/scripts/power-no-services.conf +++ b/tests/scripts/power-no-services.conf @@ -7,60 +7,56 @@ disable-upower=true disable-console-kit=true disable-login1=true -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # See if can suspend -#?*GREETER :50 GET-CAN-SUSPEND -#?GREETER :50 CAN-SUSPEND ALLOWED=FALSE +#?*GREETER-X-0 GET-CAN-SUSPEND +#?GREETER-X-0 CAN-SUSPEND ALLOWED=FALSE # Suspend -#?*GREETER :50 SUSPEND -#?GREETER :50 FAIL-SUSPEND +#?*GREETER-X-0 SUSPEND +#?GREETER-X-0 FAIL-SUSPEND # See if can hibernate -#?*GREETER :50 GET-CAN-HIBERNATE -#?GREETER :50 CAN-HIBERNATE ALLOWED=FALSE +#?*GREETER-X-0 GET-CAN-HIBERNATE +#?GREETER-X-0 CAN-HIBERNATE ALLOWED=FALSE # Hibernate -#?*GREETER :50 HIBERNATE -#?GREETER :50 FAIL-HIBERNATE +#?*GREETER-X-0 HIBERNATE +#?GREETER-X-0 FAIL-HIBERNATE # See if can restart -#?*GREETER :50 GET-CAN-RESTART -#?GREETER :50 CAN-RESTART ALLOWED=FALSE +#?*GREETER-X-0 GET-CAN-RESTART +#?GREETER-X-0 CAN-RESTART ALLOWED=FALSE # Restart -#?*GREETER :50 RESTART -#?GREETER :50 FAIL-RESTART +#?*GREETER-X-0 RESTART +#?GREETER-X-0 FAIL-RESTART # See if can shutdown -#?*GREETER :50 GET-CAN-SHUTDOWN -#?GREETER :50 CAN-SHUTDOWN ALLOWED=FALSE +#?*GREETER-X-0 GET-CAN-SHUTDOWN +#?GREETER-X-0 CAN-SHUTDOWN ALLOWED=FALSE # Shutdown -#?*GREETER :50 SHUTDOWN -#?GREETER :50 FAIL-SHUTDOWN +#?*GREETER-X-0 SHUTDOWN +#?GREETER-X-0 FAIL-SHUTDOWN # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf index 32ccae47..d909884d 100644 --- a/tests/scripts/power.conf +++ b/tests/scripts/power.conf @@ -2,64 +2,60 @@ # Check can do power operations from the greeter # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # See if can suspend -#?*GREETER :50 GET-CAN-SUSPEND +#?*GREETER-X-0 GET-CAN-SUSPEND #?LOGIN1 CAN-SUSPEND -#?GREETER :50 CAN-SUSPEND ALLOWED=TRUE +#?GREETER-X-0 CAN-SUSPEND ALLOWED=TRUE # Suspend -#?*GREETER :50 SUSPEND +#?*GREETER-X-0 SUSPEND #?LOGIN1 SUSPEND # See if can hibernate -#?*GREETER :50 GET-CAN-HIBERNATE +#?*GREETER-X-0 GET-CAN-HIBERNATE #?LOGIN1 CAN-HIBERNATE -#?GREETER :50 CAN-HIBERNATE ALLOWED=TRUE +#?GREETER-X-0 CAN-HIBERNATE ALLOWED=TRUE # Hibernate -#?*GREETER :50 HIBERNATE +#?*GREETER-X-0 HIBERNATE #?LOGIN1 HIBERNATE # See if can restart -#?*GREETER :50 GET-CAN-RESTART +#?*GREETER-X-0 GET-CAN-RESTART #?LOGIN1 CAN-REBOOT -#?GREETER :50 CAN-RESTART ALLOWED=TRUE +#?GREETER-X-0 CAN-RESTART ALLOWED=TRUE # Restart -#?*GREETER :50 RESTART +#?*GREETER-X-0 RESTART #?LOGIN1 REBOOT # See if can shutdown -#?*GREETER :50 GET-CAN-SHUTDOWN +#?*GREETER-X-0 GET-CAN-SHUTDOWN #?LOGIN1 CAN-POWER-OFF -#?GREETER :50 CAN-SHUTDOWN ALLOWED=TRUE +#?GREETER-X-0 CAN-SHUTDOWN ALLOWED=TRUE # Shutdown -#?*GREETER :50 SHUTDOWN +#?*GREETER-X-0 SHUTDOWN #?LOGIN1 POWER-OFF # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf index f45edc89..a7b71164 100644 --- a/tests/scripts/restart-authentication.conf +++ b/tests/scripts/restart-authentication.conf @@ -2,37 +2,33 @@ # Check can restart authentication # -[LightDM] -minimum-display-number=50 - #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Start authentication -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" # Restart authentication -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/script-hook-fail-display-setup.conf b/tests/scripts/script-hook-fail-display-setup.conf index a2ad5771..1b3012c9 100644 --- a/tests/scripts/script-hook-fail-display-setup.conf +++ b/tests/scripts/script-hook-fail-display-setup.conf @@ -2,26 +2,22 @@ # Check LightDM stops the display if the display setup script returns an error # -[LightDM] -minimum-display-number=50 - [SeatDefaults] display-setup-script=test-script-hook DISPLAY-SETUP 1 #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Setup script fails #?SCRIPT-HOOK DISPLAY-SETUP -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # Cleanup -# Don't know what order they will terminate #?RUNNER DAEMON-EXIT STATUS=1 diff --git a/tests/scripts/script-hook-fail-greeter-setup.conf b/tests/scripts/script-hook-fail-greeter-setup.conf index ce344c3b..464875e0 100644 --- a/tests/scripts/script-hook-fail-greeter-setup.conf +++ b/tests/scripts/script-hook-fail-greeter-setup.conf @@ -2,26 +2,22 @@ # Check LightDM stops the display if the display setup script returns an error # -[LightDM] -minimum-display-number=50 - [SeatDefaults] greeter-setup-script=test-script-hook GREETER-SETUP 1 #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Setup script fails #?SCRIPT-HOOK GREETER-SETUP -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # Cleanup -# Don't know what order they will terminate #?RUNNER DAEMON-EXIT STATUS=1 diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf index 3575342b..81519cac 100644 --- a/tests/scripts/script-hook-fail-session-setup.conf +++ b/tests/scripts/script-hook-fail-session-setup.conf @@ -2,9 +2,6 @@ # Check LightDM stops returns to the greeter if the session setup script fails # -[LightDM] -minimum-display-number=50 - [SeatDefaults] session-setup-script=test-script-hook SESSION-SETUP 1 autologin-user=have-password1 @@ -12,25 +9,24 @@ autologin-user=have-password1 #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Setup script fails #?SCRIPT-HOOK SESSION-SETUP # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf index 7a1a34ca..984ef3aa 100644 --- a/tests/scripts/script-hooks.conf +++ b/tests/scripts/script-hooks.conf @@ -2,9 +2,6 @@ # Check LightDM runs the script hooks correctly for autologin and the greeter # -[LightDM] -minimum-display-number=50 - [SeatDefaults] display-setup-script=test-script-hook DISPLAY-SETUP greeter-setup-script=test-script-hook GREETER-SETUP @@ -15,51 +12,50 @@ autologin-user=have-password1 #?RUNNER DAEMON-START # One X server should start by default -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Script hooks run #?SCRIPT-HOOK DISPLAY-SETUP #?SCRIPT-HOOK SESSION-SETUP # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Logout session -#?*SESSION :50 LOGOUT +#?*SESSION-X-0 LOGOUT # Script hook runs #?SCRIPT-HOOK SESSION-CLEANUP # X server stops -#?XSERVER :50 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Script hooks run #?SCRIPT-HOOK DISPLAY-SETUP #?SCRIPT-HOOK GREETER-SETUP # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf index 47238815..c0690774 100644 --- a/tests/scripts/session-stderr-backup.conf +++ b/tests/scripts/session-stderr-backup.conf @@ -2,90 +2,86 @@ # Check session log is backed up and restart on second login # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=no-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=no-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=no-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Write to stderr and check it shows up in the log -#?*SESSION :50 WRITE-STDERR TEXT=FIRST-SESSION -#?*SESSION :50 READ FILE=.xsession-errors -#?SESSION :50 READ FILE=.xsession-errors TEXT=FIRST-SESSION +#?*SESSION-X-0 WRITE-STDERR TEXT=FIRST-SESSION +#?*SESSION-X-0 READ FILE=.xsession-errors +#?SESSION-X-0 READ FILE=.xsession-errors TEXT=FIRST-SESSION # Restart session -#?*SESSION :50 LOGOUT -#?XSERVER :50 TERMINATE SIGNAL=15 -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON -#?*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 :50 START USER=no-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?*SESSION-X-0 LOGOUT +#?XSERVER-0 TERMINATE SIGNAL=15 +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON +#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1 +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?SESSION-X-0 START USER=no-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Write to stderr and check it shows up in the log -#?*SESSION :50 WRITE-STDERR TEXT=SECOND-SESSION -#?*SESSION :50 READ FILE=.xsession-errors -#?SESSION :50 READ FILE=.xsession-errors TEXT=SECOND-SESSION +#?*SESSION-X-0 WRITE-STDERR TEXT=SECOND-SESSION +#?*SESSION-X-0 READ FILE=.xsession-errors +#?SESSION-X-0 READ FILE=.xsession-errors TEXT=SECOND-SESSION # Check first log is backed up -#?*SESSION :50 READ FILE=.xsession-errors.old -#?SESSION :50 READ FILE=.xsession-errors.old TEXT=FIRST-SESSION +#?*SESSION-X-0 READ FILE=.xsession-errors.old +#?SESSION-X-0 READ FILE=.xsession-errors.old TEXT=FIRST-SESSION # Restart session -#?*SESSION :50 LOGOUT -#?XSERVER :50 TERMINATE SIGNAL=15 -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON -#?*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 :50 START USER=no-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?*SESSION-X-0 LOGOUT +#?XSERVER-0 TERMINATE SIGNAL=15 +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON +#?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1 +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?SESSION-X-0 START USER=no-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Write to stderr and check it shows up in the log -#?*SESSION :50 WRITE-STDERR TEXT=THIRD-SESSION -#?*SESSION :50 READ FILE=.xsession-errors -#?SESSION :50 READ FILE=.xsession-errors TEXT=THIRD-SESSION +#?*SESSION-X-0 WRITE-STDERR TEXT=THIRD-SESSION +#?*SESSION-X-0 READ FILE=.xsession-errors +#?SESSION-X-0 READ FILE=.xsession-errors TEXT=THIRD-SESSION # Check second log is backed up -#?*SESSION :50 READ FILE=.xsession-errors.old -#?SESSION :50 READ FILE=.xsession-errors.old TEXT=SECOND-SESSION +#?*SESSION-X-0 READ FILE=.xsession-errors.old +#?SESSION-X-0 READ FILE=.xsession-errors.old TEXT=SECOND-SESSION # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/session-stderr-multi-write.conf b/tests/scripts/session-stderr-multi-write.conf index f7800785..4b26e161 100644 --- a/tests/scripts/session-stderr-multi-write.conf +++ b/tests/scripts/session-stderr-multi-write.conf @@ -2,35 +2,31 @@ # Check session stderr is written to ~/.xsession-errors and multiple writes are appended # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Write to stderr and check all text ends up in log -#?*SESSION :50 WRITE-STDERR TEXT=MULTI- -#?*SESSION :50 WRITE-STDERR TEXT=WRITE -#?*SESSION :50 READ FILE=.xsession-errors -#?SESSION :50 READ FILE=.xsession-errors TEXT=MULTI-WRITE +#?*SESSION-X-0 WRITE-STDERR TEXT=MULTI- +#?*SESSION-X-0 WRITE-STDERR TEXT=WRITE +#?*SESSION-X-0 READ FILE=.xsession-errors +#?SESSION-X-0 READ FILE=.xsession-errors TEXT=MULTI-WRITE # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/session-stderr.conf b/tests/scripts/session-stderr.conf index d0caa9e0..fddea59e 100644 --- a/tests/scripts/session-stderr.conf +++ b/tests/scripts/session-stderr.conf @@ -2,34 +2,30 @@ # Check session stderr is written to ~/.xsession-errors # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Write to stderr and check it shows up in the log -#?*SESSION :50 WRITE-STDERR TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS -#?*SESSION :50 READ FILE=.xsession-errors -#?SESSION :50 READ FILE=.xsession-errors TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS +#?*SESSION-X-0 WRITE-STDERR TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS +#?*SESSION-X-0 READ FILE=.xsession-errors +#?SESSION-X-0 READ FILE=.xsession-errors TEXT=THIS-SHOULD-BE-IN-XSESSION-ERRORS # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/session-stdout.conf b/tests/scripts/session-stdout.conf index 59b95e89..bf3dc97b 100644 --- a/tests/scripts/session-stdout.conf +++ b/tests/scripts/session-stdout.conf @@ -2,34 +2,30 @@ # Check session stdout is not written anywhere # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Write to stdout and check it doesn't end up in the session error log (you should also manually check when running the test if it is printed) -#?*SESSION :50 WRITE-STDOUT TEXT=YOU-SHOULD-NOT-SEE-THIS -#?*SESSION :50 READ FILE=.xsession-errors -#?SESSION :50 READ FILE=.xsession-errors TEXT= +#?*SESSION-X-0 WRITE-STDOUT TEXT=YOU-SHOULD-NOT-SEE-THIS +#?*SESSION-X-0 READ FILE=.xsession-errors +#?SESSION-X-0 READ FILE=.xsession-errors TEXT= # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-greeter-new-session-logout-new.conf b/tests/scripts/switch-to-greeter-new-session-logout-new.conf index 43c7602f..ed59e728 100644 --- a/tests/scripts/switch-to-greeter-new-session-logout-new.conf +++ b/tests/scripts/switch-to-greeter-new-session-logout-new.conf @@ -2,76 +2,72 @@ # Use D-Bus interface to show the greeter, then start a new session and log out of it # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Show the greeter #?*SWITCH-TO-GREETER #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON # Login -#?*GREETER :51 AUTHENTICATE USERNAME=have-password2 -#?GREETER :51 SHOW-PROMPT TEXT="Password:" -#?*GREETER :51 RESPOND TEXT="password" -#?GREETER :51 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE -#?*GREETER :51 START-SESSION -#?GREETER :51 TERMINATE SIGNAL=15 +#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2 +#?GREETER-X-1 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-1 RESPOND TEXT="password" +#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE +#?*GREETER-X-1 START-SESSION +#?GREETER-X-1 TERMINATE SIGNAL=15 # New session starts -#?SESSION :51 START USER=have-password2 -#?XSERVER :51 ACCEPT-CONNECT -#?SESSION :51 CONNECT-XSERVER +#?SESSION-X-1 START USER=have-password2 +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER # Logout of new session -#?*SESSION :51 LOGOUT -#?XSERVER :51 TERMINATE SIGNAL=15 +#?*SESSION-X-1 LOGOUT +#?XSERVER-1 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-greeter-new-session-logout-old.conf b/tests/scripts/switch-to-greeter-new-session-logout-old.conf index cbe07a0b..2fe64f75 100644 --- a/tests/scripts/switch-to-greeter-new-session-logout-old.conf +++ b/tests/scripts/switch-to-greeter-new-session-logout-old.conf @@ -2,80 +2,76 @@ # Use D-Bus interface to show the greeter, then start a new session, switch to the old one and log out # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Show the greeter #?*SWITCH-TO-GREETER #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON # Login -#?*GREETER :51 AUTHENTICATE USERNAME=have-password2 -#?GREETER :51 SHOW-PROMPT TEXT="Password:" -#?*GREETER :51 RESPOND TEXT="password" -#?GREETER :51 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE -#?*GREETER :51 START-SESSION -#?GREETER :51 TERMINATE SIGNAL=15 +#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2 +#?GREETER-X-1 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-1 RESPOND TEXT="password" +#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE +#?*GREETER-X-1 START-SESSION +#?GREETER-X-1 TERMINATE SIGNAL=15 # New session starts -#?SESSION :51 START USER=have-password2 -#?XSERVER :51 ACCEPT-CONNECT -#?SESSION :51 CONNECT-XSERVER +#?SESSION-X-1 START USER=have-password2 +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER # Switch to old session #?*SWITCH-TO-USER USERNAME=have-password1 #?RUNNER SWITCH-TO-USER USERNAME=have-password1 # Logout of old session -#?*SESSION :50 LOGOUT -#?XSERVER :50 TERMINATE SIGNAL=15 +#?*SESSION-X-0 LOGOUT +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf index 513c98a1..83ced4d0 100644 --- a/tests/scripts/switch-to-greeter-new-session.conf +++ b/tests/scripts/switch-to-greeter-new-session.conf @@ -2,62 +2,58 @@ # Use D-Bus interface to show the greeter, then start a new session # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Show the greeter #?*SWITCH-TO-GREETER #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON # Login -#?*GREETER :51 AUTHENTICATE USERNAME=have-password2 -#?GREETER :51 SHOW-PROMPT TEXT="Password:" -#?*GREETER :51 RESPOND TEXT="password" -#?GREETER :51 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE -#?*GREETER :51 START-SESSION -#?GREETER :51 TERMINATE SIGNAL=15 +#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2 +#?GREETER-X-1 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-1 RESPOND TEXT="password" +#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password2 AUTHENTICATED=TRUE +#?*GREETER-X-1 START-SESSION +#?GREETER-X-1 TERMINATE SIGNAL=15 # New session starts -#?SESSION :51 START USER=have-password2 -#?XSERVER :51 ACCEPT-CONNECT -#?SESSION :51 CONNECT-XSERVER +#?SESSION-X-1 START USER=have-password2 +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf index 8bcabb89..bb62c6f0 100644 --- a/tests/scripts/switch-to-greeter-return-session-logout.conf +++ b/tests/scripts/switch-to-greeter-return-session-logout.conf @@ -2,74 +2,70 @@ # Use D-Bus interface to show the greeter, then return to the same session, then logout # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Show the greeter #?*SWITCH-TO-GREETER #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON # Login as existing user -#?*GREETER :51 AUTHENTICATE USERNAME=have-password1 -#?GREETER :51 SHOW-PROMPT TEXT="Password:" -#?*GREETER :51 RESPOND TEXT="password" -#?GREETER :51 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :51 START-SESSION +#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-1 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-1 RESPOND TEXT="password" +#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-1 START-SESSION # Greeter and X server stop -#?GREETER :51 TERMINATE SIGNAL=15 -#?XSERVER :51 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 # Logout session -#?*SESSION :50 LOGOUT -#?XSERVER :50 TERMINATE SIGNAL=15 +#?*SESSION-X-0 LOGOUT +#?XSERVER-0 TERMINATE SIGNAL=15 # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf index 98315a1f..9c4fdee7 100644 --- a/tests/scripts/switch-to-greeter-return-session.conf +++ b/tests/scripts/switch-to-greeter-return-session.conf @@ -2,58 +2,54 @@ # Use D-Bus interface to show the greeter, then return to the same session # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Show the greeter #?*SWITCH-TO-GREETER #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON # Login as existing user -#?*GREETER :51 AUTHENTICATE USERNAME=have-password1 -#?GREETER :51 SHOW-PROMPT TEXT="Password:" -#?*GREETER :51 RESPOND TEXT="password" -#?GREETER :51 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :51 START-SESSION +#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-1 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-1 RESPOND TEXT="password" +#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-1 START-SESSION # Greeter and X server stop -#?GREETER :51 TERMINATE SIGNAL=15 -#?XSERVER :51 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf index a68a9357..4ae3e11f 100644 --- a/tests/scripts/switch-to-greeter.conf +++ b/tests/scripts/switch-to-greeter.conf @@ -2,49 +2,45 @@ # Use D-Bus interface to show the greeter # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Show the greeter #?*SWITCH-TO-GREETER #?RUNNER SWITCH-TO-GREETER # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf index b096c51b..4a3a899c 100644 --- a/tests/scripts/switch-to-guest.conf +++ b/tests/scripts/switch-to-guest.conf @@ -2,9 +2,6 @@ # Check D-Bus interface can trigger/switch to guest session # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 @@ -12,35 +9,35 @@ autologin-user=have-password1 #?*WAIT # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Default session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Switch to guest #?*SWITCH-TO-GUEST #?RUNNER SWITCH-TO-GUEST # New X server starts -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Guest account created #?GUEST-ACCOUNT ADD USERNAME=guest-.* # Guest session starts -#?SESSION :51 START USER=guest-.* -#?XSERVER :51 ACCEPT-CONNECT -#?SESSION :51 CONNECT-XSERVER +#?SESSION-X-1 START USER=guest-.* +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER # Switch again, should not do anything as guest already running #?*SWITCH-TO-GUEST @@ -49,10 +46,9 @@ autologin-user=have-password1 # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest-.* #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-user-existing-session.conf b/tests/scripts/switch-to-user-existing-session.conf index 525618b8..001bb7d7 100644 --- a/tests/scripts/switch-to-user-existing-session.conf +++ b/tests/scripts/switch-to-user-existing-session.conf @@ -2,9 +2,6 @@ # Check that switching to an existing user does nothing # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 @@ -12,16 +9,16 @@ autologin-user=have-password1 #?*WAIT # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Switch to account with a password #?*SWITCH-TO-USER USERNAME=have-password1 @@ -32,7 +29,6 @@ autologin-user=have-password1 # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(XSERVER :50 TERMINATE SIGNAL=15|SESSION :50 TERMINATE SIGNAL=15) -#?(XSERVER :50 TERMINATE SIGNAL=15|SESSION :50 TERMINATE SIGNAL=15) +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-user-logout.conf b/tests/scripts/switch-to-user-logout.conf index 19088e6d..0670ce14 100644 --- a/tests/scripts/switch-to-user-logout.conf +++ b/tests/scripts/switch-to-user-logout.conf @@ -2,9 +2,6 @@ # Check that logging out from a switched user returns to the greeter # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 @@ -12,58 +9,57 @@ autologin-user=have-password1 #?*WAIT # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # 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 -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # New session starts -#?SESSION :51 START USER=no-password1 -#?XSERVER :51 ACCEPT-CONNECT -#?SESSION :51 CONNECT-XSERVER +#?SESSION-X-1 START USER=no-password1 +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER # Logout session -#?*SESSION :51 LOGOUT +#?*SESSION-X-1 LOGOUT # X server stops -#?XSERVER :51 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 # X server starts for greeter -#?XSERVER :51 START -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf index f3786300..47cc3ebc 100644 --- a/tests/scripts/switch-to-user-no-password.conf +++ b/tests/scripts/switch-to-user-no-password.conf @@ -2,9 +2,6 @@ # Check that switching to a user without a password doesn't show a greeter # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 @@ -12,38 +9,37 @@ autologin-user=have-password1 #?*WAIT # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # 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 -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # New session starts -#?SESSION :51 START USER=no-password1 -#?XSERVER :51 ACCEPT-CONNECT -#?SESSION :51 CONNECT-XSERVER +#?SESSION-X-1 START USER=no-password1 +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf index cc726b44..e221bc60 100644 --- a/tests/scripts/switch-to-user.conf +++ b/tests/scripts/switch-to-user.conf @@ -2,9 +2,6 @@ # Check that switching to a user shows the greeter # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=no-password1 @@ -12,45 +9,44 @@ autologin-user=no-password1 #?*WAIT # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=no-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=no-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # 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 -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # Greeter starts -#?GREETER :51 START -#?XSERVER :51 ACCEPT-CONNECT -#?GREETER :51 CONNECT-XSERVER -#?GREETER :51 CONNECT-TO-DAEMON -#?GREETER :51 CONNECTED-TO-DAEMON +#?GREETER-X-1 START +#?XSERVER-1 ACCEPT-CONNECT +#?GREETER-X-1 CONNECT-XSERVER +#?GREETER-X-1 CONNECT-TO-DAEMON +#?GREETER-X-1 CONNECTED-TO-DAEMON # 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:" +#?GREETER-X-1 SELECT-USER-HINT USERNAME=have-password1 +#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-1 SHOW-PROMPT TEXT="Password:" # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GREETER :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GREETER-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/switch-to-users.conf b/tests/scripts/switch-to-users.conf index e4ac78f1..efe23de6 100644 --- a/tests/scripts/switch-to-users.conf +++ b/tests/scripts/switch-to-users.conf @@ -2,9 +2,6 @@ # Check that switching to multiple users works # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 @@ -12,56 +9,55 @@ autologin-user=have-password1 #?*WAIT # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # 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 -#?XSERVER :51 INDICATE-READY +#?XSERVER-1 START +#?XSERVER-1 INDICATE-READY # LightDM connects to X server -#?XSERVER :51 ACCEPT-CONNECT +#?XSERVER-1 ACCEPT-CONNECT # New session starts -#?SESSION :51 START USER=no-password1 -#?XSERVER :51 ACCEPT-CONNECT -#?SESSION :51 CONNECT-XSERVER +#?SESSION-X-1 START USER=no-password1 +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER # 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 -#?XSERVER :52 INDICATE-READY +#?XSERVER-2 START +#?XSERVER-2 INDICATE-READY # LightDM connects to X server -#?XSERVER :52 ACCEPT-CONNECT +#?XSERVER-2 ACCEPT-CONNECT # New session starts -#?SESSION :52 START USER=no-password2 -#?XSERVER :52 ACCEPT-CONNECT -#?SESSION :52 CONNECT-XSERVER +#?SESSION-X-2 START USER=no-password2 +#?XSERVER-2 ACCEPT-CONNECT +#?SESSION-X-2 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|SESSION :51 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15|SESSION :52 TERMINATE SIGNAL=15|XSERVER :52 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 +#?SESSION-X-2 TERMINATE SIGNAL=15 +#?XSERVER-2 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf index 17f4de54..0e196089 100644 --- a/tests/scripts/system-xauthority.conf +++ b/tests/scripts/system-xauthority.conf @@ -3,7 +3,6 @@ # [LightDM] -minimum-display-number=50 user-authority-in-system-dir=true [SeatDefaults] @@ -12,24 +11,23 @@ autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Check where the X authority is -#?*SESSION :50 READ-ENV NAME=XAUTHORITY -#?SESSION :50 READ-ENV NAME=XAUTHORITY VALUE=.*/var/run/lightdm/have-password1/xauthority +#?*SESSION-X-0 READ-ENV NAME=XAUTHORITY +#?SESSION-X-0 READ-ENV NAME=XAUTHORITY VALUE=.*/var/run/lightdm/have-password1/xauthority # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf index f7e9c20e..1d913106 100644 --- a/tests/scripts/user-renamed-invalid.conf +++ b/tests/scripts/user-renamed-invalid.conf @@ -2,33 +2,29 @@ # Check if PAM renames the user to one that doesn't exist lightdm handles this # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=change-user-invalid #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # (fails to start session for invalid user) # Greeter starts -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/user-renamed.conf b/tests/scripts/user-renamed.conf index 9f03b008..84ee3574 100644 --- a/tests/scripts/user-renamed.conf +++ b/tests/scripts/user-renamed.conf @@ -2,29 +2,25 @@ # Check if PAM renames the user then lightdm detects this and uses the new user account # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=change-user1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=change-user2 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=change-user2 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/util-path.conf b/tests/scripts/util-path.conf index 185ff981..0b195a30 100644 --- a/tests/scripts/util-path.conf +++ b/tests/scripts/util-path.conf @@ -2,34 +2,30 @@ # Check utility path is set in session # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Check utility path is there -#?*SESSION :50 READ-ENV NAME=PATH +#?*SESSION-X-0 READ-ENV NAME=PATH # FIXME: This is a really crap regex and the path could be overridden in the configure stage -#?SESSION :50 READ-ENV NAME=PATH VALUE=.*/lightdm:.* +#?SESSION-X-0 READ-ENV NAME=PATH VALUE=.*/lightdm:.* # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf index b078b1dc..5586ac6b 100644 --- a/tests/scripts/vnc-command.conf +++ b/tests/scripts/vnc-command.conf @@ -3,7 +3,6 @@ # [LightDM] -minimum-display-number=50 start-default-seat=false [VNCServer] @@ -20,9 +19,23 @@ command=Xvnc -option #?VNC-CLIENT CONNECT SERVER=::9999 # Xvnc server starts -#?XSERVER :50 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE +#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=TRUE + +# Negotiate with Xvnc +#?VNC-CLIENT CONNECTED VERSION="RFB 003.007" +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XSERVER-0 ACCEPT-CONNECT + +# Greeter starts and connects to remote X server +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Clean up #?*STOP-DAEMON -#?XSERVER :50 TERMINATE SIGNAL=15 +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf index b1d99d47..93b16f0d 100644 --- a/tests/scripts/vnc-dimensions.conf +++ b/tests/scripts/vnc-dimensions.conf @@ -3,7 +3,6 @@ # [LightDM] -minimum-display-number=50 start-default-seat=false [VNCServer] @@ -22,9 +21,23 @@ depth=16 #?VNC-CLIENT CONNECT SERVER=::9999 # Xvnc server starts -#?XSERVER :50 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE +#?XSERVER-0 START GEOMETRY=1440x900 DEPTH=16 OPTION=FALSE + +# Negotiate with Xvnc +#?VNC-CLIENT CONNECTED VERSION="RFB 003.007" +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XSERVER-0 ACCEPT-CONNECT + +# Greeter starts and connects to remote X server +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Clean up #?*STOP-DAEMON -#?XSERVER :50 TERMINATE SIGNAL=15 +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf index b22104c7..f62e0a80 100644 --- a/tests/scripts/vnc-login.conf +++ b/tests/scripts/vnc-login.conf @@ -3,7 +3,6 @@ # [LightDM] -minimum-display-number=50 start-default-seat=false [VNCServer] @@ -19,39 +18,39 @@ port=9999 #?VNC-CLIENT CONNECT SERVER=::9999 # Xvnc server starts -#?XSERVER :50 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE +#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE # Negotiate with Xvnc #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 INDICATE-READY # LightDM and vnc-client connect to X server -#?(XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"|XSERVER :50 ACCEPT-CONNECT) -#?(XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"|XSERVER :50 ACCEPT-CONNECT) +#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts and connects to remote X server -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log in -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Clean up #?*STOP-DAEMON -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf index a73f69e7..b77bdb81 100644 --- a/tests/scripts/vnc-open-file-descriptors.conf +++ b/tests/scripts/vnc-open-file-descriptors.conf @@ -3,7 +3,6 @@ # [LightDM] -minimum-display-number=50 start-default-seat=false [VNCServer] @@ -19,44 +18,44 @@ port=9999 #?VNC-CLIENT CONNECT SERVER=::9999 # Xvnc server starts -#?XSERVER :50 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE +#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE # Negotiate with Xvnc #?VNC-CLIENT CONNECTED VERSION="RFB 003.007" -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 INDICATE-READY -#?XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003" +#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003" # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Greeter starts and connects to remote X server -#?GREETER :50 START -#?XSERVER :50 ACCEPT-CONNECT -#?GREETER :50 CONNECT-XSERVER -#?GREETER :50 CONNECT-TO-DAEMON -#?GREETER :50 CONNECTED-TO-DAEMON +#?GREETER-X-0 START +#?XSERVER-0 ACCEPT-CONNECT +#?GREETER-X-0 CONNECT-XSERVER +#?GREETER-X-0 CONNECT-TO-DAEMON +#?GREETER-X-0 CONNECTED-TO-DAEMON # Log in -#?*GREETER :50 AUTHENTICATE USERNAME=have-password1 -#?GREETER :50 SHOW-PROMPT TEXT="Password:" -#?*GREETER :50 RESPOND TEXT="password" -#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE -#?*GREETER :50 START-SESSION -#?GREETER :50 TERMINATE SIGNAL=15 +#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-0 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-0 RESPOND TEXT="password" +#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-0 START-SESSION +#?GREETER-X-0 TERMINATE SIGNAL=15 # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Check file descriptors -#?*SESSION :50 LIST-UNKNOWN-FILE-DESCRIPTORS -#?SESSION :50 LIST-UNKNOWN-FILE-DESCRIPTORS FDS= +#?*SESSION-X-0 LIST-UNKNOWN-FILE-DESCRIPTORS +#?SESSION-X-0 LIST-UNKNOWN-FILE-DESCRIPTORS FDS= # Clean up #?*STOP-DAEMON -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/xauthority.conf b/tests/scripts/xauthority.conf index f07890bb..790cde14 100644 --- a/tests/scripts/xauthority.conf +++ b/tests/scripts/xauthority.conf @@ -2,33 +2,29 @@ # Check X authority written into home directory # -[LightDM] -minimum-display-number=50 - [SeatDefaults] autologin-user=have-password1 #?RUNNER DAEMON-START # X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +#?XSERVER-0 START +#?XSERVER-0 INDICATE-READY # LightDM connects to X server -#?XSERVER :50 ACCEPT-CONNECT +#?XSERVER-0 ACCEPT-CONNECT # Session starts -#?SESSION :50 START USER=have-password1 -#?XSERVER :50 ACCEPT-CONNECT -#?SESSION :50 CONNECT-XSERVER +#?SESSION-X-0 START USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER # Check where the X authority is -#?*SESSION :50 READ-ENV NAME=XAUTHORITY -#?SESSION :50 READ-ENV NAME=XAUTHORITY VALUE=.*/home/have-password1/.Xauthority +#?*SESSION-X-0 READ-ENV NAME=XAUTHORITY +#?SESSION-X-0 READ-ENV NAME=XAUTHORITY VALUE=.*/home/have-password1/.Xauthority # Cleanup #?*STOP-DAEMON -# Don't know what order they will terminate -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/xdmcp-login.conf b/tests/scripts/xdmcp-login.conf index 3167d73a..13f6d621 100644 --- a/tests/scripts/xdmcp-login.conf +++ b/tests/scripts/xdmcp-login.conf @@ -4,7 +4,6 @@ [LightDM] start-default-seat=false -minimum-display-number=50 [XDMCPServer] enabled=true @@ -15,39 +14,39 @@ port=9999 # Start a remote X server to log in with XDMCP #?*START-XSERVER ARGS=":98 -query localhost -port 9999 -nolisten unix" -#?XSERVER :98 START -#?XSERVER :98 SEND-QUERY +#?XSERVER-98 START +#?XSERVER-98 SEND-QUERY # Negotiate with daemon -#?XSERVER :98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS="" -#?XSERVER :98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER" -#?XSERVER :98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" -#?XSERVER :98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS" +#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS="" +#?XSERVER-98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER" +#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" +#?XSERVER-98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS" # LightDM connects to X server -#?XSERVER :98 TCP-ACCEPT-CONNECT +#?XSERVER-98 ACCEPT-CONNECT # Greeter starts and connects to remote X server -#?GREETER 127.0.0.1:98 START -#?XSERVER :98 TCP-ACCEPT-CONNECT -#?GREETER 127.0.0.1:98 CONNECT-XSERVER -#?GREETER 127.0.0.1:98 CONNECT-TO-DAEMON -#?GREETER 127.0.0.1:98 CONNECTED-TO-DAEMON +#?GREETER-X-127.0.0.1:98 START +#?XSERVER-98 ACCEPT-CONNECT +#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER +#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON +#?GREETER-X-127.0.0.1:98 CONNECTED-TO-DAEMON # Log in -#?*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=have-password1 AUTHENTICATED=TRUE -#?*GREETER 127.0.0.1:98 START-SESSION -#?GREETER 127.0.0.1:98 TERMINATE SIGNAL=15 +#?*GREETER-X-127.0.0.1:98 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-127.0.0.1:98 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-127.0.0.1:98 RESPOND TEXT="password" +#?GREETER-X-127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-127.0.0.1:98 START-SESSION +#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15 # Session starts -#?SESSION 127.0.0.1:98 START USER=have-password1 -#?XSERVER :98 TCP-ACCEPT-CONNECT -#?SESSION 127.0.0.1:98 CONNECT-XSERVER +#?SESSION-X-127.0.0.1:98 START USER=have-password1 +#?XSERVER-98 ACCEPT-CONNECT +#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER # Clean up #?*STOP-DAEMON -#?SESSION 127.0.0.1:98 TERMINATE SIGNAL=15 +#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/xdmcp-open-file-descriptors.conf b/tests/scripts/xdmcp-open-file-descriptors.conf index 779b6be9..78073936 100644 --- a/tests/scripts/xdmcp-open-file-descriptors.conf +++ b/tests/scripts/xdmcp-open-file-descriptors.conf @@ -4,7 +4,6 @@ [LightDM] start-default-seat=false -minimum-display-number=50 [XDMCPServer] enabled=true @@ -15,43 +14,43 @@ port=9999 # Start a remote X server to log in with XDMCP #?*START-XSERVER ARGS=":98 -query localhost -port 9999 -nolisten unix" -#?XSERVER :98 START -#?XSERVER :98 SEND-QUERY +#?XSERVER-98 START +#?XSERVER-98 SEND-QUERY # Negotiate with daemon -#?XSERVER :98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS="" -#?XSERVER :98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER" -#?XSERVER :98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" -#?XSERVER :98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS" +#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS="" +#?XSERVER-98 SEND-REQUEST DISPLAY-NUMBER=98 AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER" +#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1" +#?XSERVER-98 SEND-MANAGE SESSION-ID=[0-9]* DISPLAY-NUMBER=98 DISPLAY-CLASS="DISPLAY CLASS" # LightDM connects to X server -#?XSERVER :98 TCP-ACCEPT-CONNECT +#?XSERVER-98 ACCEPT-CONNECT # Greeter starts and connects to remote X server -#?GREETER 127.0.0.1:98 START -#?XSERVER :98 TCP-ACCEPT-CONNECT -#?GREETER 127.0.0.1:98 CONNECT-XSERVER -#?GREETER 127.0.0.1:98 CONNECT-TO-DAEMON -#?GREETER 127.0.0.1:98 CONNECTED-TO-DAEMON +#?GREETER-X-127.0.0.1:98 START +#?XSERVER-98 ACCEPT-CONNECT +#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER +#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON +#?GREETER-X-127.0.0.1:98 CONNECTED-TO-DAEMON # Log in -#?*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=have-password1 AUTHENTICATED=TRUE -#?*GREETER 127.0.0.1:98 START-SESSION -#?GREETER 127.0.0.1:98 TERMINATE SIGNAL=15 +#?*GREETER-X-127.0.0.1:98 AUTHENTICATE USERNAME=have-password1 +#?GREETER-X-127.0.0.1:98 SHOW-PROMPT TEXT="Password:" +#?*GREETER-X-127.0.0.1:98 RESPOND TEXT="password" +#?GREETER-X-127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE +#?*GREETER-X-127.0.0.1:98 START-SESSION +#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15 # Session starts -#?SESSION 127.0.0.1:98 START USER=have-password1 -#?XSERVER :98 TCP-ACCEPT-CONNECT -#?SESSION 127.0.0.1:98 CONNECT-XSERVER +#?SESSION-X-127.0.0.1:98 START USER=have-password1 +#?XSERVER-98 ACCEPT-CONNECT +#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER # Check file descriptors -#?*SESSION 127.0.0.1:98 LIST-UNKNOWN-FILE-DESCRIPTORS -#?SESSION 127.0.0.1:98 LIST-UNKNOWN-FILE-DESCRIPTORS FDS= +#?*SESSION-X-127.0.0.1:98 LIST-UNKNOWN-FILE-DESCRIPTORS +#?SESSION-X-127.0.0.1:98 LIST-UNKNOWN-FILE-DESCRIPTORS FDS= # Clean up #?*STOP-DAEMON -#?SESSION 127.0.0.1:98 TERMINATE SIGNAL=15 +#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15 #?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/xserver-fail-start.conf b/tests/scripts/xserver-fail-start.conf index 883f60a6..1ea8ea42 100644 --- a/tests/scripts/xserver-fail-start.conf +++ b/tests/scripts/xserver-fail-start.conf @@ -1,8 +1,6 @@ # # Check that LightDM handles an X server that fails to start. # -[LightDM] -minimum-display-number=50 [test-xserver-config] return-value=1 @@ -10,8 +8,8 @@ return-value=1 #?RUNNER DAEMON-START # X server fails to start -#?XSERVER :50 START -#?XSERVER :50 EXIT CODE=1 +#?XSERVER-0 START +#?XSERVER-0 EXIT CODE=1 # Daemon stops with error #?RUNNER DAEMON-EXIT STATUS=1 diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am index c771a0e4..586059b2 100644 --- a/tests/src/Makefile.am +++ b/tests/src/Makefile.am @@ -5,10 +5,11 @@ noinst_LTLIBRARIES = libsystem.la libsystem_la_SOURCES = libsystem.c libsystem_la_CFLAGS = \ $(GLIB_CFLAGS) \ + $(GIO_UNIX_CFLAGS) \ -DSRCDIR=\"$(abs_top_srcdir)\" \ -DBUILDDIR=\"$(abs_top_builddir)\" \ -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" -libsystem_la_LIBADD = -ldl $(GLIB_LIBS) +libsystem_la_LIBADD = -ldl $(GLIB_LIBS) $(GIO_UNIX_LIBS) # This is required to have autotools generate a library that is not installed # but produces a shared library (instead of just a static library) @@ -80,7 +81,7 @@ test_gobject_greeter_LDADD = \ -llightdm-gobject-1 \ $(GLIB_LIBS) \ $(GIO_UNIX_LIBS) \ - $(XCB_LIBS) + $(XCB_LIBS) guest_account_SOURCES = guest-account.c status.c status.h guest_account_CFLAGS = \ diff --git a/tests/src/X.c b/tests/src/X.c index 5318afdd..86ae768d 100644 --- a/tests/src/X.c +++ b/tests/src/X.c @@ -62,7 +62,7 @@ indicate_ready () handler = signal (SIGUSR1, SIG_IGN); if (handler == SIG_IGN) { - status_notify ("XSERVER :%d INDICATE-READY", display_number); + status_notify ("XSERVER-%d INDICATE-READY", display_number); kill (getppid (), SIGUSR1); } signal (SIGUSR1, handler); @@ -73,12 +73,12 @@ signal_cb (int signum) { if (signum == SIGHUP) { - status_notify ("XSERVER :%d DISCONNECT-CLIENTS", display_number); + status_notify ("XSERVER-%d DISCONNECT-CLIENTS", display_number); indicate_ready (); } else { - status_notify ("XSERVER :%d TERMINATE SIGNAL=%d", display_number, signum); + status_notify ("XSERVER-%d TERMINATE SIGNAL=%d", display_number, signum); quit (EXIT_SUCCESS); } } @@ -90,7 +90,7 @@ xdmcp_query_cb (XDMCPClient *client) if (!notified_query) { - status_notify ("XSERVER :%d SEND-QUERY", display_number); + status_notify ("XSERVER-%d SEND-QUERY", display_number); notified_query = TRUE; } } @@ -101,9 +101,9 @@ xdmcp_willing_cb (XDMCPClient *client, XDMCPWilling *message) gchar **authorization_names; GInetAddress *addresses[2]; - status_notify ("XSERVER :%d GOT-WILLING AUTHENTICATION-NAME=\"%s\" HOSTNAME=\"%s\" STATUS=\"%s\"", display_number, message->authentication_name, message->hostname, message->status); + status_notify ("XSERVER-%d GOT-WILLING AUTHENTICATION-NAME=\"%s\" HOSTNAME=\"%s\" STATUS=\"%s\"", display_number, message->authentication_name, message->hostname, message->status); - status_notify ("XSERVER :%d SEND-REQUEST DISPLAY-NUMBER=%d AUTHORIZATION-NAME=\"%s\" MFID=\"%s\"", display_number, display_number, "MIT-MAGIC-COOKIE-1", "TEST XSERVER"); + status_notify ("XSERVER-%d SEND-REQUEST DISPLAY-NUMBER=%d AUTHORIZATION-NAME=\"%s\" MFID=\"%s\"", display_number, display_number, "MIT-MAGIC-COOKIE-1", "TEST XSERVER"); authorization_names = g_strsplit ("MIT-MAGIC-COOKIE-1", " ", -1); addresses[0] = xdmcp_client_get_local_address (client); @@ -118,7 +118,7 @@ xdmcp_willing_cb (XDMCPClient *client, XDMCPWilling *message) static void xdmcp_accept_cb (XDMCPClient *client, XDMCPAccept *message) { - status_notify ("XSERVER :%d GOT-ACCEPT SESSION-ID=%d AUTHENTICATION-NAME=\"%s\" AUTHORIZATION-NAME=\"%s\"", display_number, message->session_id, message->authentication_name, message->authorization_name); + status_notify ("XSERVER-%d GOT-ACCEPT SESSION-ID=%d AUTHENTICATION-NAME=\"%s\" AUTHORIZATION-NAME=\"%s\"", display_number, message->session_id, message->authentication_name, message->authorization_name); /* Ignore if haven't picked a valid authorization */ if (strcmp (message->authorization_name, "MIT-MAGIC-COOKIE-1") != 0) @@ -129,83 +129,28 @@ xdmcp_accept_cb (XDMCPClient *client, XDMCPAccept *message) xdmcp_cookie = g_malloc (message->authorization_data_length); memcpy (xdmcp_cookie, message->authorization_data, message->authorization_data_length); - status_notify ("XSERVER :%d SEND-MANAGE SESSION-ID=%d DISPLAY-NUMBER=%d DISPLAY-CLASS=\"%s\"", display_number, message->session_id, display_number, "DISPLAY CLASS"); + status_notify ("XSERVER-%d SEND-MANAGE SESSION-ID=%d DISPLAY-NUMBER=%d DISPLAY-CLASS=\"%s\"", display_number, message->session_id, display_number, "DISPLAY CLASS"); xdmcp_client_send_manage (client, message->session_id, display_number, "DISPLAY CLASS"); } static void xdmcp_decline_cb (XDMCPClient *client, XDMCPDecline *message) { - status_notify ("XSERVER :%d GOT-DECLINE STATUS=\"%s\" AUTHENTICATION-NAME=\"%s\"", display_number, message->status, message->authentication_name); + status_notify ("XSERVER-%d GOT-DECLINE STATUS=\"%s\" AUTHENTICATION-NAME=\"%s\"", display_number, message->status, message->authentication_name); } static void xdmcp_failed_cb (XDMCPClient *client, XDMCPFailed *message) { - status_notify ("XSERVER :%d GOT-FAILED SESSION-ID=%d STATUS=\"%s\"", display_number, message->session_id, message->status); + status_notify ("XSERVER-%d GOT-FAILED SESSION-ID=%d STATUS=\"%s\"", display_number, message->session_id, message->status); } static void -x_client_connect_cb (XClient *client, XConnect *message) +client_connected_cb (XServer *server, XClient *client) { gchar *auth_error = NULL; - if (x_client_get_address (client)) - status_notify ("XSERVER :%d TCP-ACCEPT-CONNECT", display_number); - else - status_notify ("XSERVER :%d ACCEPT-CONNECT", display_number); - - if (xdmcp_client) - { - if (!xdmcp_cookie) - auth_error = g_strdup ("Need to authenticate with XDMCP"); - else - { - gboolean matches = TRUE; - if (message->authorization_protocol_data_length == xdmcp_cookie_length) - { - guint16 i; - for (i = 0; i < xdmcp_cookie_length && message->authorization_protocol_data[i] == xdmcp_cookie[i]; i++); - matches = i == xdmcp_cookie_length; - } - else - matches = FALSE; - - if (strcmp (message->authorization_protocol_name, "MIT-MAGIC-COOKIE-1") != 0) - auth_error = g_strdup ("Authorization required"); - else if (!matches) - auth_error = g_strdup_printf ("Invalid MIT-MAGIC-COOKIE key"); - } - } - else if (auth_path) - { - XAuthority *authority; - XAuthorityRecord *record = NULL; - GError *error = NULL; - - authority = x_authority_new (); - x_authority_load (authority, auth_path, &error); - if (error) - g_warning ("Error reading auth file: %s", error->message); - g_clear_error (&error); - - if (x_client_get_address (client)) - record = x_authority_match_localhost (authority, message->authorization_protocol_name); // FIXME: Should check if remote - else - record = x_authority_match_local (authority, message->authorization_protocol_name); - if (record) - { - if (strcmp (message->authorization_protocol_name, "MIT-MAGIC-COOKIE-1") == 0) - { - if (!x_authority_record_check_cookie (record, message->authorization_protocol_data, message->authorization_protocol_data_length)) - auth_error = g_strdup_printf ("Invalid MIT-MAGIC-COOKIE key"); - } - else - auth_error = g_strdup_printf ("Unknown authorization: '%s'", message->authorization_protocol_name); - } - else - auth_error = g_strdup ("No authorization record"); - } + status_notify ("XSERVER-%d ACCEPT-CONNECT", display_number); if (auth_error) x_client_send_failed (client, auth_error); @@ -215,12 +160,6 @@ x_client_connect_cb (XClient *client, XConnect *message) } static void -client_connected_cb (XServer *server, XClient *client) -{ - g_signal_connect (client, "connect", G_CALLBACK (x_client_connect_cb), NULL); -} - -static void client_disconnected_cb (XServer *server, XClient *client) { g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); @@ -239,7 +178,7 @@ request_cb (const gchar *request) return; } - r = g_strdup_printf ("XSERVER :%d CRASH", display_number); + r = g_strdup_printf ("XSERVER-%d CRASH", display_number); if (strcmp (request, r) == 0) { cleanup (); @@ -258,6 +197,7 @@ main (int argc, char **argv) gboolean do_xdmcp = FALSE; guint xdmcp_port = 0; gchar *xdmcp_host = NULL; + gchar *lock_filename; int lock_file; signal (SIGINT, signal_cb); @@ -345,13 +285,8 @@ main (int argc, char **argv) xserver = x_server_new (display_number); g_signal_connect (xserver, "client-connected", G_CALLBACK (client_connected_cb), NULL); g_signal_connect (xserver, "client-disconnected", G_CALLBACK (client_disconnected_cb), NULL); - x_server_set_listen_unix (xserver, listen_unix); - x_server_set_listen_tcp (xserver, listen_tcp); - - /* Add fake screen so that libx11 calls don't freak out when they can't find a screen */ - x_server_add_screen (xserver, 0xffffff, 0x000000, 0, 1024, 768, 1000, 1000); - status_notify ("XSERVER :%d START", display_number); + status_notify ("XSERVER-%d START", display_number); config = g_key_file_new (); g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL); @@ -359,11 +294,13 @@ main (int argc, char **argv) if (g_key_file_has_key (config, "test-xserver-config", "return-value", NULL)) { int return_value = g_key_file_get_integer (config, "test-xserver-config", "return-value", NULL); - status_notify ("XSERVER :%d EXIT CODE=%d", display_number, return_value); + status_notify ("XSERVER-%d EXIT CODE=%d", display_number, return_value); return return_value; } - lock_path = g_strdup_printf ("/tmp/.X%d-lock", display_number); + lock_filename = g_strdup_printf (".X%d-lock", display_number); + lock_path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", lock_filename, NULL); + g_free (lock_filename); lock_file = open (lock_path, O_CREAT | O_EXCL | O_WRONLY, 0444); if (lock_file < 0) { @@ -380,14 +317,22 @@ main (int argc, char **argv) proc_filename = g_strdup_printf ("/proc/%d", pid); if (!g_file_test (proc_filename, G_FILE_TEST_EXISTS)) { + gchar *socket_dir; + gchar *socket_filename; gchar *socket_path; - socket_path = g_strdup_printf ("/tmp/.X11-unix/X%d", display_number); + socket_dir = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", ".X11-unix", NULL); + g_mkdir_with_parents (socket_dir, 0755); + + socket_filename = g_strdup_printf ("X%d", display_number); + socket_path = g_build_filename (socket_dir, socket_filename, NULL); g_printerr ("Breaking lock on non-existant process %d\n", pid); unlink (lock_path); unlink (socket_path); + g_free (socket_dir); + g_free (socket_filename); g_free (socket_path); } g_free (proc_filename); diff --git a/tests/src/Xvnc.c b/tests/src/Xvnc.c index 156e121f..247c5c6e 100644 --- a/tests/src/Xvnc.c +++ b/tests/src/Xvnc.c @@ -35,7 +35,7 @@ indicate_ready () handler = signal (SIGUSR1, SIG_IGN); if (handler == SIG_IGN) { - status_notify ("XSERVER :%d INDICATE-READY", display_number); + status_notify ("XSERVER-%d INDICATE-READY", display_number); kill (getppid (), SIGUSR1); } signal (SIGUSR1, handler); @@ -62,55 +62,22 @@ signal_cb (int signum) { if (signum == SIGHUP) { - status_notify ("XSERVER :%d DISCONNECT-CLIENTS", display_number); + status_notify ("XSERVER-%d DISCONNECT-CLIENTS", display_number); indicate_ready (); } else { - status_notify ("XSERVER :%d TERMINATE SIGNAL=%d", display_number, signum); + status_notify ("XSERVER-%d TERMINATE SIGNAL=%d", display_number, signum); quit (EXIT_SUCCESS); } } static void -x_client_connect_cb (XClient *client, XConnect *message) +client_connected_cb (XServer *server, XClient *client) { gchar *auth_error = NULL; - if (x_client_get_address (client)) - status_notify ("XSERVER :%d TCP-ACCEPT-CONNECT", display_number); - else - status_notify ("XSERVER :%d ACCEPT-CONNECT", display_number); - - if (auth_path) - { - XAuthority *authority; - XAuthorityRecord *record = NULL; - GError *error = NULL; - - authority = x_authority_new (); - x_authority_load (authority, auth_path, &error); - if (error) - g_warning ("Error reading auth file: %s", error->message); - g_clear_error (&error); - - if (x_client_get_address (client)) - record = x_authority_match_localhost (authority, message->authorization_protocol_name); // FIXME: Should check if remote - else - record = x_authority_match_local (authority, message->authorization_protocol_name); - if (record) - { - if (strcmp (message->authorization_protocol_name, "MIT-MAGIC-COOKIE-1") == 0) - { - if (!x_authority_record_check_cookie (record, message->authorization_protocol_data, message->authorization_protocol_data_length)) - auth_error = g_strdup_printf ("Invalid MIT-MAGIC-COOKIE key"); - } - else - auth_error = g_strdup_printf ("Unknown authorization: '%s'", message->authorization_protocol_name); - } - else - auth_error = g_strdup ("No authorization record"); - } + status_notify ("XSERVER-%d ACCEPT-CONNECT", display_number); if (auth_error) x_client_send_failed (client, auth_error); @@ -120,12 +87,6 @@ x_client_connect_cb (XClient *client, XConnect *message) } static void -client_connected_cb (XServer *server, XClient *client) -{ - g_signal_connect (client, "connect", G_CALLBACK (x_client_connect_cb), NULL); -} - -static void client_disconnected_cb (XServer *server, XClient *client) { g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); @@ -151,7 +112,7 @@ vnc_data_cb (GIOChannel *channel, GIOCondition condition, gpointer data) buffer[n_read] = '\0'; if (g_str_has_suffix (buffer, "\n")) buffer[n_read-1] = '\0'; - status_notify ("XSERVER :%d VNC-CLIENT-CONNECT VERSION=\"%s\"", display_number, buffer); + status_notify ("XSERVER-%d VNC-CLIENT-CONNECT VERSION=\"%s\"", display_number, buffer); } return TRUE; @@ -177,6 +138,7 @@ main (int argc, char **argv) gboolean has_option = FALSE; gchar *geometry = g_strdup ("640x480"); gint depth = 8; + gchar *lock_filename; int lock_file; int i; @@ -250,10 +212,8 @@ main (int argc, char **argv) xserver = x_server_new (display_number); g_signal_connect (xserver, "client-connected", G_CALLBACK (client_connected_cb), NULL); g_signal_connect (xserver, "client-disconnected", G_CALLBACK (client_disconnected_cb), NULL); - x_server_set_listen_unix (xserver, listen_unix); - x_server_set_listen_tcp (xserver, listen_tcp); - status_notify ("XSERVER :%d START GEOMETRY=%s DEPTH=%d OPTION=%s", display_number, geometry, depth, has_option ? "TRUE" : "FALSE"); + status_notify ("XSERVER-%d START GEOMETRY=%s DEPTH=%d OPTION=%s", display_number, geometry, depth, has_option ? "TRUE" : "FALSE"); config = g_key_file_new (); g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL); @@ -272,7 +232,9 @@ main (int argc, char **argv) return EXIT_FAILURE; } - lock_path = g_strdup_printf ("/tmp/.X%d-lock", display_number); + lock_filename = g_strdup_printf (".X%d-lock", display_number); + lock_path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", lock_filename, NULL); + g_free (lock_filename); lock_file = open (lock_path, O_CREAT | O_EXCL | O_WRONLY, 0444); if (lock_file < 0) { diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c index d853e30f..77806ede 100644 --- a/tests/src/libsystem.c +++ b/tests/src/libsystem.c @@ -14,6 +14,8 @@ #include <linux/vt.h> #endif #include <glib.h> +#include <xcb/xcb.h> +#include <gio/gunixsocketaddress.h> #define LOGIN_PROMPT "login:" @@ -215,6 +217,22 @@ open64 (const char *pathname, int flags, ...) } int +access (const char *pathname, int mode) +{ + int (*_access) (const char *pathname, int mode); + gchar *new_path = NULL; + int ret; + + _access = (int (*)(const char *pathname, int mode)) dlsym (RTLD_NEXT, "access"); + + new_path = redirect_path (pathname); + ret = _access (new_path, mode); + g_free (new_path); + + return ret; +} + +int ioctl (int d, int request, void *data) { int (*_ioctl) (int d, int request, void *data); @@ -1148,3 +1166,85 @@ void endutxent (void) { } + +struct xcb_connection_t +{ + gchar *display; + int error; + GSocket *socket; +}; + +xcb_connection_t * +xcb_connect_to_display_with_auth_info (const char *display, xcb_auth_info_t *auth, int *screen) +{ + xcb_connection_t *c; + gchar *socket_path; + GSocketAddress *address; + GError *error = NULL; + + c = malloc (sizeof (xcb_connection_t)); + c->display = g_strdup (display); + c->error = 0; + + if (display == NULL) + display = getenv ("DISPLAY"); + if (display == NULL) + c->error = XCB_CONN_CLOSED_PARSE_ERR; + + if (c->error == 0) + { + c->socket = g_socket_new (G_SOCKET_FAMILY_UNIX, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &error); + if (error) + g_printerr ("%s\n", error->message); + g_clear_error (&error); + if (c->socket == NULL) + c->error = XCB_CONN_ERROR; + } + + if (c->error == 0) + { + const gchar *d; + + /* Skip the hostname, we'll assume it's localhost */ + d = strchr (display, ':'); + + socket_path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", d, NULL); + address = g_unix_socket_address_new (socket_path); + g_free (socket_path); + if (!g_socket_connect (c->socket, address, NULL, &error)) + c->error = XCB_CONN_ERROR; + if (error) + g_printerr ("%s\n", error->message); + g_clear_error (&error); + } + + // FIXME: Send auth info + if (c->error == 0) + { + } + + g_object_unref (address); + + return c; +} + +xcb_connection_t * +xcb_connect (const char *displayname, int *screenp) +{ + return xcb_connect_to_display_with_auth_info(displayname, NULL, screenp); +} + +int +xcb_connection_has_error (xcb_connection_t *c) +{ + return c->error; +} + +void +xcb_disconnect (xcb_connection_t *c) +{ + free (c->display); + if (c->socket) + g_object_unref (c->socket); + free (c); +} diff --git a/tests/src/status.c b/tests/src/status.c index cc9b46a7..6ca6ce42 100644 --- a/tests/src/status.c +++ b/tests/src/status.c @@ -96,11 +96,6 @@ status_notify (const gchar *format, ...) if (error) g_printerr ("Failed to write to status socket: %s\n", error->message); g_clear_error (&error); - /* We sync filesystem here, to guarantee that statuses sent from - multiple process (e.g. greeter and X) are all ordered correctly. - Without this, there is a race that manifests occasionally between - close status_notify calls. fsync does not seem to do the trick. */ - sync (); } else g_printerr ("%s\n", status); diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c index 6244c91a..bfcbf89d 100644 --- a/tests/src/test-gobject-greeter.c +++ b/tests/src/test-gobject-greeter.c @@ -8,6 +8,7 @@ #include "status.h" +static gchar *greeter_id; static GMainLoop *loop; static LightDMGreeter *greeter; static xcb_connection_t *connection = NULL; @@ -16,39 +17,39 @@ static GKeyFile *config; static void show_message_cb (LightDMGreeter *greeter, const gchar *text, LightDMMessageType type) { - status_notify ("GREETER %s SHOW-MESSAGE TEXT=\"%s\"", getenv ("DISPLAY"), text); + status_notify ("%s SHOW-MESSAGE TEXT=\"%s\"", greeter_id, text); } static void show_prompt_cb (LightDMGreeter *greeter, const gchar *text, LightDMPromptType type) { - status_notify ("GREETER %s SHOW-PROMPT TEXT=\"%s\"", getenv ("DISPLAY"), text); + status_notify ("%s SHOW-PROMPT TEXT=\"%s\"", greeter_id, text); } static void authentication_complete_cb (LightDMGreeter *greeter) { if (lightdm_greeter_get_authentication_user (greeter)) - status_notify ("GREETER %s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s", - getenv ("DISPLAY"), + status_notify ("%s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s", + greeter_id, lightdm_greeter_get_authentication_user (greeter), lightdm_greeter_get_is_authenticated (greeter) ? "TRUE" : "FALSE"); else - status_notify ("GREETER %s AUTHENTICATION-COMPLETE AUTHENTICATED=%s", - getenv ("DISPLAY"), + status_notify ("%s AUTHENTICATION-COMPLETE AUTHENTICATED=%s", + greeter_id, lightdm_greeter_get_is_authenticated (greeter) ? "TRUE" : "FALSE"); } static void autologin_timer_expired_cb (LightDMGreeter *greeter) { - status_notify ("GREETER %s AUTOLOGIN-TIMER-EXPIRED", getenv ("DISPLAY")); + status_notify ("%s AUTOLOGIN-TIMER-EXPIRED", greeter_id); } static void signal_cb (int signum) { - status_notify ("GREETER %s TERMINATE SIGNAL=%d", getenv ("DISPLAY"), signum); + status_notify ("%s TERMINATE SIGNAL=%d", greeter_id, signum); exit (EXIT_SUCCESS); } @@ -63,32 +64,32 @@ request_cb (const gchar *request) return; } - r = g_strdup_printf ("GREETER %s AUTHENTICATE", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE", greeter_id); if (strcmp (request, r) == 0) lightdm_greeter_authenticate (greeter, NULL); g_free (r); - r = g_strdup_printf ("GREETER %s AUTHENTICATE USERNAME=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE USERNAME=", greeter_id); if (g_str_has_prefix (request, r)) lightdm_greeter_authenticate (greeter, request + strlen (r)); g_free (r); - r = g_strdup_printf ("GREETER %s AUTHENTICATE-GUEST", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE-GUEST", greeter_id); if (strcmp (request, r) == 0) lightdm_greeter_authenticate_as_guest (greeter); g_free (r); - r = g_strdup_printf ("GREETER %s AUTHENTICATE-AUTOLOGIN", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE-AUTOLOGIN", greeter_id); if (strcmp (request, r) == 0) lightdm_greeter_authenticate_autologin (greeter); g_free (r); - r = g_strdup_printf ("GREETER %s AUTHENTICATE-REMOTE SESSION=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE-REMOTE SESSION=", greeter_id); if (g_str_has_prefix (request, r)) lightdm_greeter_authenticate_remote (greeter, request + strlen (r), NULL); g_free (r); - r = g_strdup_printf ("GREETER %s RESPOND TEXT=\"", getenv ("DISPLAY")); + r = g_strdup_printf ("%s RESPOND TEXT=\"", greeter_id); if (g_str_has_prefix (request, r)) { gchar *text = g_strdup (request + strlen (r)); @@ -98,36 +99,28 @@ request_cb (const gchar *request) } g_free (r); - r = g_strdup_printf ("GREETER %s CANCEL-AUTHENTICATION", getenv ("DISPLAY")); + r = g_strdup_printf ("%s CANCEL-AUTHENTICATION", greeter_id); if (strcmp (request, r) == 0) lightdm_greeter_cancel_authentication (greeter); g_free (r); - r = g_strdup_printf ("GREETER %s START-SESSION", getenv ("DISPLAY")); + r = g_strdup_printf ("%s START-SESSION", greeter_id); if (strcmp (request, r) == 0) { if (!lightdm_greeter_start_session_sync (greeter, NULL, NULL)) - status_notify ("GREETER %s SESSION-FAILED", getenv ("DISPLAY")); + status_notify ("%s SESSION-FAILED", greeter_id); } g_free (r); - r = g_strdup_printf ("GREETER %s START-SESSION SESSION=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s START-SESSION SESSION=", greeter_id); if (g_str_has_prefix (request, r)) { if (!lightdm_greeter_start_session_sync (greeter, request + strlen (r), NULL)) - status_notify ("GREETER %s SESSION-FAILED", getenv ("DISPLAY")); + status_notify ("%s SESSION-FAILED", greeter_id); } g_free (r); - r = g_strdup_printf ("GREETER %s LOG-LAYOUT", getenv ("DISPLAY")); - if (strcmp (request, r) == 0) - { - const gchar *layout; - layout = lightdm_layout_get_name (lightdm_get_layout ()); - status_notify ("GREETER %s LOG-LAYOUT LAYOUT='%s'", getenv ("DISPLAY"), layout ? layout : ""); - } - - r = g_strdup_printf ("GREETER %s LOG-LAYOUT USERNAME=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s LOG-LAYOUT USERNAME=", greeter_id); if (g_str_has_prefix (request, r)) { LightDMUser *user; @@ -137,11 +130,11 @@ request_cb (const gchar *request) user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username); layout = lightdm_user_get_layout (user); - status_notify ("GREETER %s LOG-LAYOUT USERNAME=%s LAYOUT='%s'", getenv ("DISPLAY"), username, layout ? layout : ""); + status_notify ("%s LOG-LAYOUT USERNAME=%s LAYOUT='%s'", greeter_id, username, layout ? layout : ""); } g_free (r); - r = g_strdup_printf ("GREETER %s LOG-LAYOUTS USERNAME=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s LOG-LAYOUTS USERNAME=", greeter_id); if (g_str_has_prefix (request, r)) { LightDMUser *user; @@ -154,34 +147,11 @@ request_cb (const gchar *request) layouts = lightdm_user_get_layouts (user); for (i = 0; layouts[i]; i++) - status_notify ("GREETER %s LOG-LAYOUTS USERNAME=%s LAYOUT='%s'", getenv ("DISPLAY"), username, layouts[i]); - } - g_free (r); - - r = g_strdup_printf ("GREETER %s LOG-VARIANTS LAYOUT=", getenv ("DISPLAY")); - if (g_str_has_prefix (request, r)) - { - GList *layouts, *iter; - const gchar *layout_prefix; - - layout_prefix = request + strlen (r); - layouts = lightdm_get_layouts (); - - for (iter = layouts; iter; iter = iter->next) - { - LightDMLayout *layout; - const gchar *name; - - layout = (LightDMLayout *) iter->data; - name = lightdm_layout_get_name (layout); - - if (g_str_has_prefix (name, layout_prefix)) - status_notify ("GREETER %s LOG-VARIANTS LAYOUT='%s'", getenv ("DISPLAY"), name); - } + status_notify ("%s LOG-LAYOUTS USERNAME=%s LAYOUT='%s'", greeter_id, username, layouts[i]); } g_free (r); - r = g_strdup_printf ("GREETER %s LOG-LANGUAGE USERNAME=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s LOG-LANGUAGE USERNAME=", greeter_id); if (g_str_has_prefix (request, r)) { LightDMUser *user; @@ -191,78 +161,78 @@ request_cb (const gchar *request) user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username); language = lightdm_user_get_language (user); - status_notify ("GREETER %s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s", getenv ("DISPLAY"), username, language ? language : ""); + status_notify ("%s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s", greeter_id, username, language ? language : ""); } g_free (r); - r = g_strdup_printf ("GREETER %s GET-CAN-SUSPEND", getenv ("DISPLAY")); + r = g_strdup_printf ("%s GET-CAN-SUSPEND", greeter_id); if (strcmp (request, r) == 0) { gboolean can_suspend = lightdm_get_can_suspend (); - status_notify ("GREETER %s CAN-SUSPEND ALLOWED=%s", getenv ("DISPLAY"), can_suspend ? "TRUE" : "FALSE"); + status_notify ("%s CAN-SUSPEND ALLOWED=%s", greeter_id, can_suspend ? "TRUE" : "FALSE"); } g_free (r); - r = g_strdup_printf ("GREETER %s SUSPEND", getenv ("DISPLAY")); + r = g_strdup_printf ("%s SUSPEND", greeter_id); if (strcmp (request, r) == 0) { GError *error = NULL; if (!lightdm_suspend (&error)) - status_notify ("GREETER %s FAIL-SUSPEND", getenv ("DISPLAY")); + status_notify ("%s FAIL-SUSPEND", greeter_id); g_clear_error (&error); } g_free (r); - r = g_strdup_printf ("GREETER %s GET-CAN-HIBERNATE", getenv ("DISPLAY")); + r = g_strdup_printf ("%s GET-CAN-HIBERNATE", greeter_id); if (strcmp (request, r) == 0) { gboolean can_hibernate = lightdm_get_can_hibernate (); - status_notify ("GREETER %s CAN-HIBERNATE ALLOWED=%s", getenv ("DISPLAY"), can_hibernate ? "TRUE" : "FALSE"); + status_notify ("%s CAN-HIBERNATE ALLOWED=%s", greeter_id, can_hibernate ? "TRUE" : "FALSE"); } g_free (r); - r = g_strdup_printf ("GREETER %s HIBERNATE", getenv ("DISPLAY")); + r = g_strdup_printf ("%s HIBERNATE", greeter_id); if (strcmp (request, r) == 0) { GError *error = NULL; if (!lightdm_hibernate (&error)) - status_notify ("GREETER %s FAIL-HIBERNATE", getenv ("DISPLAY")); + status_notify ("%s FAIL-HIBERNATE", greeter_id); g_clear_error (&error); } g_free (r); - r = g_strdup_printf ("GREETER %s GET-CAN-RESTART", getenv ("DISPLAY")); + r = g_strdup_printf ("%s GET-CAN-RESTART", greeter_id); if (strcmp (request, r) == 0) { gboolean can_restart = lightdm_get_can_restart (); - status_notify ("GREETER %s CAN-RESTART ALLOWED=%s", getenv ("DISPLAY"), can_restart ? "TRUE" : "FALSE"); + status_notify ("%s CAN-RESTART ALLOWED=%s", greeter_id, can_restart ? "TRUE" : "FALSE"); } g_free (r); - r = g_strdup_printf ("GREETER %s RESTART", getenv ("DISPLAY")); + r = g_strdup_printf ("%s RESTART", greeter_id); if (strcmp (request, r) == 0) { GError *error = NULL; if (!lightdm_restart (&error)) - status_notify ("GREETER %s FAIL-RESTART", getenv ("DISPLAY")); + status_notify ("%s FAIL-RESTART", greeter_id); g_clear_error (&error); } g_free (r); - r = g_strdup_printf ("GREETER %s GET-CAN-SHUTDOWN", getenv ("DISPLAY")); + r = g_strdup_printf ("%s GET-CAN-SHUTDOWN", greeter_id); if (strcmp (request, r) == 0) { gboolean can_shutdown = lightdm_get_can_shutdown (); - status_notify ("GREETER %s CAN-SHUTDOWN ALLOWED=%s", getenv ("DISPLAY"), can_shutdown ? "TRUE" : "FALSE"); + status_notify ("%s CAN-SHUTDOWN ALLOWED=%s", greeter_id, can_shutdown ? "TRUE" : "FALSE"); } g_free (r); - r = g_strdup_printf ("GREETER %s SHUTDOWN", getenv ("DISPLAY")); + r = g_strdup_printf ("%s SHUTDOWN", greeter_id); if (strcmp (request, r) == 0) { GError *error = NULL; if (!lightdm_shutdown (&error)) - status_notify ("GREETER %s FAIL-SHUTDOWN", getenv ("DISPLAY")); + status_notify ("%s FAIL-SHUTDOWN", greeter_id); g_clear_error (&error); } g_free (r); @@ -271,6 +241,8 @@ request_cb (const gchar *request) int main (int argc, char **argv) { + gchar *display; + signal (SIGINT, signal_cb); signal (SIGTERM, signal_cb); @@ -278,11 +250,19 @@ main (int argc, char **argv) g_type_init (); #endif + display = getenv ("DISPLAY"); + if (display == NULL) + greeter_id = g_strdup ("GREETER-?"); + else if (display[0] == ':') + greeter_id = g_strdup_printf ("GREETER-X-%s", display + 1); + else + greeter_id = g_strdup_printf ("GREETER-X-%s", display); + loop = g_main_loop_new (NULL, FALSE); status_connect (request_cb); - status_notify ("GREETER %s START", getenv ("DISPLAY")); + status_notify ("%s START", greeter_id); config = g_key_file_new (); g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL); @@ -290,7 +270,7 @@ main (int argc, char **argv) if (g_key_file_has_key (config, "test-greeter-config", "return-value", NULL)) { int return_value = g_key_file_get_integer (config, "test-greeter-config", "return-value", NULL); - status_notify ("GREETER %s EXIT CODE=%d", getenv ("DISPLAY"), return_value); + status_notify ("%s EXIT CODE=%d", greeter_id, return_value); return return_value; } @@ -298,11 +278,11 @@ main (int argc, char **argv) if (xcb_connection_has_error (connection)) { - status_notify ("GREETER %s FAIL-CONNECT-XSERVER", getenv ("DISPLAY")); + status_notify ("%s FAIL-CONNECT-XSERVER", greeter_id); return EXIT_FAILURE; } - status_notify ("GREETER %s CONNECT-XSERVER", getenv ("DISPLAY")); + status_notify ("%s CONNECT-XSERVER", greeter_id); greeter = lightdm_greeter_new (); g_signal_connect (greeter, "show-message", G_CALLBACK (show_message_cb), NULL); @@ -310,19 +290,19 @@ main (int argc, char **argv) g_signal_connect (greeter, "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL); g_signal_connect (greeter, "autologin-timer-expired", G_CALLBACK (autologin_timer_expired_cb), NULL); - status_notify ("GREETER %s CONNECT-TO-DAEMON", getenv ("DISPLAY")); + status_notify ("%s CONNECT-TO-DAEMON", greeter_id); if (!lightdm_greeter_connect_sync (greeter, NULL)) { - status_notify ("GREETER %s FAIL-CONNECT-DAEMON", getenv ("DISPLAY")); + status_notify ("%s FAIL-CONNECT-DAEMON", greeter_id); return EXIT_FAILURE; } - status_notify ("GREETER %s CONNECTED-TO-DAEMON", getenv ("DISPLAY")); + status_notify ("%s CONNECTED-TO-DAEMON", greeter_id); if (lightdm_greeter_get_select_user_hint (greeter)) - status_notify ("GREETER %s SELECT-USER-HINT USERNAME=%s", getenv ("DISPLAY"), lightdm_greeter_get_select_user_hint (greeter)); + status_notify ("%s SELECT-USER-HINT USERNAME=%s", greeter_id, lightdm_greeter_get_select_user_hint (greeter)); if (lightdm_greeter_get_lock_hint (greeter)) - status_notify ("GREETER %s LOCK-HINT", getenv ("DISPLAY")); + status_notify ("%s LOCK-HINT", greeter_id); g_main_loop_run (loop); diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter index ca45b7b3..b5b02eee 100755 --- a/tests/src/test-python-greeter +++ b/tests/src/test-python-greeter @@ -9,10 +9,18 @@ import signal from gi.repository import GLib from gi.repository import LightDM +display = os.getenv ('DISPLAY'); +if display is None: + greeter_id = 'GREETER-?' +elif display.startswith (':'): + greeter_id = 'GREETER-X-%s' % display[1:] +else: + greeter_id = 'GREETER-X-%s' % display + loop = GLib.MainLoop () def sigterm_cb (data): - status_notify ('GREETER %s TERMINATE SIGNAL=%d' % (os.getenv ('DISPLAY'), signal.SIGTERM)) + status_notify ('%s TERMINATE SIGNAL=%d' % (greeter_id, signal.SIGTERM)) loop.quit () GLib.unix_signal_add (GLib.PRIORITY_DEFAULT, signal.SIGTERM, sigterm_cb, None) @@ -33,126 +41,126 @@ def request_cb (channel, condition): (l,) = struct.unpack ('i', length) request = status_socket.recv (l) - r = 'GREETER %s AUTHENTICATE' % os.getenv ('DISPLAY') + r = '%s AUTHENTICATE' % greeter_id if request == r: greeter.authenticate (None) - r = 'GREETER %s AUTHENTICATE USERNAME=' % os.getenv ('DISPLAY') + r = '%s AUTHENTICATE USERNAME=' % greeter_id if request.startswith (r): greeter.authenticate (request[len(r):]) - r = 'GREETER %s AUTHENTICATE-GUEST' % os.getenv ('DISPLAY') + r = '%s AUTHENTICATE-GUEST' % greeter_id if request == r: greeter.authenticate_as_guest () - r = 'GREETER %s AUTHENTICATE-AUTOLOGIN' % os.getenv ('DISPLAY') + r = '%s AUTHENTICATE-AUTOLOGIN' % greeter_id if request == r: greeter.authenticate_autologin () - r = 'GREETER %s AUTHENTICATE-REMOTE SESSION=' % os.getenv ('DISPLAY') + r = '%s AUTHENTICATE-REMOTE SESSION=' % greeter_id if request.startswith (r): greeter.authenticate_remote (request[len(r):], None) - r = 'GREETER %s RESPOND TEXT=\"' % os.getenv ('DISPLAY') + r = '%s RESPOND TEXT=\"' % greeter_id if request.startswith (r): greeter.respond (request[len (r):-1]) - r = 'GREETER %s CANCEL-AUTHENTICATION' % os.getenv ('DISPLAY') + r = '%s CANCEL-AUTHENTICATION' % greeter_id if request == r: greeter.cancel_authentication () - r = 'GREETER %s START-SESSION' % os.getenv ('DISPLAY') + r = '%s START-SESSION' % greeter_id if request == r: if not greeter.start_session_sync (None): - status_notify ('GREETER %s SESSION-FAILED' % os.getenv ('DISPLAY')) + status_notify ('%s SESSION-FAILED' % greeter_id) - r = 'GREETER %s START-SESSION SESSION=' % os.getenv ('DISPLAY') + r = '%s START-SESSION SESSION=' % greeter_id if request.startswith (r): if not greeter.start_session_sync (request[len(r):]): - status_notify ('GREETER %s SESSION-FAILED' % os.getenv ('DISPLAY')) + status_notify ('%s SESSION-FAILED' % greeter_id) - r = 'GREETER %s LOG-LAYOUT' % os.getenv ('DISPLAY') + r = '%s LOG-LAYOUT' % greeter_id if request == r: layout = LightDM.get_layout ().get_name () - status_notify ('GREETER %s LOG-LAYOUT LAYOUT=%s' % (os.getenv ('DISPLAY'), layout)) + status_notify ('%s LOG-LAYOUT LAYOUT=%s' % (greeter_id, layout)) - r = 'GREETER %s LOG-LAYOUT USERNAME=' % os.getenv ('DISPLAY') + r = '%s LOG-LAYOUT USERNAME=' % greeter_id if request.startswith (r): username = request[len(r):] user = LightDM.UserList.get_instance ().get_user_by_name (username) layout = user.get_layout () if layout is None: layout = '' - status_notify ('GREETER %s LOG-LAYOUT USERNAME=%s LAYOUT=%s' % (os.getenv ('DISPLAY'), username, layout)) + status_notify ('%s LOG-LAYOUT USERNAME=%s LAYOUT=%s' % (greeter_id, username, layout)) - r = 'GREETER %s LOG-LANGUAGE USERNAME=' % os.getenv ('DISPLAY') + r = '%s LOG-LANGUAGE USERNAME=' % greeter_id if request.startswith (r): username = request[len(r):] user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username) language = lightdm_user_get_language (user) if language is None: language = '' - status_notify ('GREETER %s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s' % (os.getenv ('DISPLAY'), username, language)) + status_notify ('%s LOG-LANGUAGE USERNAME=%s LANGUAGE=%s' % (greeter_id, username, language)) - r = 'GREETER %s GET-CAN-SUSPEND' % os.getenv ('DISPLAY') + r = '%s GET-CAN-SUSPEND' % greeter_id if request == r: if LightDM.get_can_suspend (): allowed = "TRUE" else: allowed = "FALSE" - status_notify ('GREETER %s CAN-SUSPEND ALLOWED=%s' % (os.getenv ('DISPLAY'), allowed)) + status_notify ('%s CAN-SUSPEND ALLOWED=%s' % (greeter_id, allowed)) - r = 'GREETER %s SUSPEND' % os.getenv ('DISPLAY') + r = '%s SUSPEND' % greeter_id if request == r: try: LightDM.suspend () except: - status_notify ('GREETER %s FAIL-SUSPEND' % os.getenv ('DISPLAY')) + status_notify ('%s FAIL-SUSPEND' % greeter_id) - r = 'GREETER %s GET-CAN-HIBERNATE' % os.getenv ('DISPLAY') + r = '%s GET-CAN-HIBERNATE' % greeter_id if request == r: if LightDM.get_can_hibernate (): allowed = "TRUE" else: allowed = "FALSE" - status_notify ('GREETER %s CAN-HIBERNATE ALLOWED=%s' % (os.getenv ('DISPLAY'), allowed)) + status_notify ('%s CAN-HIBERNATE ALLOWED=%s' % (greeter_id, allowed)) - r = 'GREETER %s HIBERNATE' % os.getenv ('DISPLAY') + r = '%s HIBERNATE' % greeter_id if request == r: try: LightDM.hibernate () except: - status_notify ('GREETER %s FAIL-HIBERNATE' % os.getenv ('DISPLAY')) + status_notify ('%s FAIL-HIBERNATE' % greeter_id) - r = 'GREETER %s GET-CAN-RESTART' % os.getenv ('DISPLAY') + r = '%s GET-CAN-RESTART' % greeter_id if request == r: if LightDM.get_can_restart (): allowed = "TRUE" else: allowed = "FALSE" - status_notify ('GREETER %s CAN-RESTART ALLOWED=%s' % (os.getenv ('DISPLAY'), allowed)) + status_notify ('%s CAN-RESTART ALLOWED=%s' % (greeter_id, allowed)) - r = 'GREETER %s RESTART' % os.getenv ('DISPLAY') + r = '%s RESTART' % greeter_id if request == r: try: LightDM.restart () except: - status_notify ('GREETER %s FAIL-RESTART' % os.getenv ('DISPLAY')) + status_notify ('%s FAIL-RESTART' % greeter_id) - r = 'GREETER %s GET-CAN-SHUTDOWN' % os.getenv ('DISPLAY') + r = '%s GET-CAN-SHUTDOWN' % greeter_id if request == r: if LightDM.get_can_shutdown (): allowed = "TRUE" else: allowed = "FALSE" - status_notify ('GREETER %s CAN-SHUTDOWN ALLOWED=%s' % (os.getenv ('DISPLAY'), allowed)) + status_notify ('%s CAN-SHUTDOWN ALLOWED=%s' % (greeter_id, allowed)) - r = 'GREETER %s SHUTDOWN' % os.getenv ('DISPLAY') + r = '%s SHUTDOWN' % greeter_id if request == r: try: LightDM.shutdown () except: - status_notify ('GREETER %s FAIL-SHUTDOWN' % os.getenv ('DISPLAY')) + status_notify ('%s FAIL-SHUTDOWN' % greeter_id) return True @@ -161,16 +169,16 @@ status_socket = socket.socket (socket.AF_UNIX, socket.SOCK_STREAM) status_socket.connect (path) GLib.io_add_watch (status_socket.fileno (), GLib.IO_IN | GLib.IO_HUP, request_cb) -status_notify ('GREETER %s START' % os.getenv ('DISPLAY')) +status_notify ('%s START' % greeter_id) # NOTE: There don't seem to be any good X bindings so we have to mock up our own... -(host, display) = os.getenv ('DISPLAY').split (':') +(host, display_number) = display.split (':') if host == '': x_socket = socket.socket (socket.AF_UNIX, socket.SOCK_STREAM) - x_socket.connect ('/tmp/.X11-unix/X%s' % display) + x_socket.connect (os.getenv ('LIGHTDM_TEST_ROOT') + '/tmp/' + display) else: x_socket = socket.socket (socket.AF_INET, socket.SOCK_STREAM) - x_socket.connect ((host, 6000 + int (display))) + x_socket.connect ((host, 6000 + int (display_number))) authority = subprocess.check_output(['xauth', 'list']).split () auth_name = '' auth_data = '' @@ -185,19 +193,14 @@ def pad (value): return value + '\x00' * (4 - len (value) % 4) else: return value -x_socket.send (struct.pack ('!cxHHHHxx', 'B', 11, 0, len (auth_name), len (auth_data)) + pad (auth_name) + pad (auth_data)) -data = x_socket.recv (1024) -if ord (data[0]) != 1: - status_notify ('GREETER %s FAIL-CONNECT-XSERVER' % os.getenv ('DISPLAY')) - exit (1) -status_notify ('GREETER %s CONNECT-XSERVER' % (os.getenv ('DISPLAY'))) +status_notify ('%s CONNECT-XSERVER' % (greeter_id)) def show_message_cb (greeter, text, type): - status_notify ('GREETER %s SHOW-MESSAGE TEXT=\"%s\"' % (os.getenv ('DISPLAY'), text)) + status_notify ('%s SHOW-MESSAGE TEXT=\"%s\"' % (greeter_id, text)) def show_prompt_cb (greeter, text, type): - status_notify ('GREETER %s SHOW-PROMPT TEXT=\"%s\"' % (os.getenv ('DISPLAY'), text)) + status_notify ('%s SHOW-PROMPT TEXT=\"%s\"' % (greeter_id, text)) def authentication_complete_cb (greeter): if greeter.get_is_authenticated (): @@ -205,12 +208,12 @@ def authentication_complete_cb (greeter): else: is_authenticated = 'FALSE' if greeter.get_authentication_user () is not None: - status_notify ('GREETER %s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s' % (os.getenv ('DISPLAY'), greeter.get_authentication_user (), is_authenticated)) + status_notify ('%s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s' % (greeter_id, greeter.get_authentication_user (), is_authenticated)) else: - status_notify ('GREETER %s AUTHENTICATION-COMPLETE AUTHENTICATED=%s' % (os.getenv ('DISPLAY'), is_authenticated)) + status_notify ('%s AUTHENTICATION-COMPLETE AUTHENTICATED=%s' % (greeter_id, is_authenticated)) def autologin_timer_expired_cb (greeter): - status_notify ('GREETER %s AUTOLOGIN-TIMER-EXPIRED' % os.getenv ('DISPLAY')) + status_notify ('%s AUTOLOGIN-TIMER-EXPIRED' % greeter_id) greeter = LightDM.Greeter () greeter.connect ('show-message', show_message_cb) @@ -218,16 +221,16 @@ greeter.connect ('show-prompt', show_prompt_cb) greeter.connect ('authentication-complete', authentication_complete_cb) greeter.connect ('autologin-timer-expired', autologin_timer_expired_cb) -status_notify ('GREETER %s CONNECT-TO-DAEMON' % os.getenv ('DISPLAY')) +status_notify ('%s CONNECT-TO-DAEMON' % greeter_id) if not greeter.connect_sync (): - status_notify ('GREETER %s FAIL-CONNECT-DAEMON' % os.getenv ('DISPLAY')) + status_notify ('%s FAIL-CONNECT-DAEMON' % greeter_id) exit (1) -status_notify ('GREETER %s CONNECTED-TO-DAEMON' % os.getenv ('DISPLAY')) +status_notify ('%s CONNECTED-TO-DAEMON' % greeter_id) if greeter.get_select_user_hint () is not None: - status_notify ('GREETER %s SELECT-USER-HINT USERNAME=%s' % (os.getenv ('DISPLAY'), greeter.get_select_user_hint ())) + status_notify ('%s SELECT-USER-HINT USERNAME=%s' % (greeter_id, greeter.get_select_user_hint ())) if greeter.get_lock_hint (): - status_notify ('GREETER %s LOCK-HINT' % os.getenv ('DISPLAY')); + status_notify ('%s LOCK-HINT' % greeter_id); loop.run () diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp index b7ae3631..b6a591de 100644 --- a/tests/src/test-qt-greeter.cpp +++ b/tests/src/test-qt-greeter.cpp @@ -13,6 +13,7 @@ #include "test-qt-greeter.h" #include "status.h" +static gchar *greeter_id; static QCoreApplication *app = NULL; static QSettings *config = NULL; static QLightDM::PowerInterface *power = NULL; @@ -28,33 +29,33 @@ TestGreeter::TestGreeter () void TestGreeter::showMessage (QString text, QLightDM::Greeter::MessageType type) { - status_notify ("GREETER %s SHOW-MESSAGE TEXT=\"%s\"", getenv ("DISPLAY"), text.toAscii ().constData ()); + status_notify ("%s SHOW-MESSAGE TEXT=\"%s\"", greeter_id, text.toAscii ().constData ()); } void TestGreeter::showPrompt (QString text, QLightDM::Greeter::PromptType type) { - status_notify ("GREETER %s SHOW-PROMPT TEXT=\"%s\"", getenv ("DISPLAY"), text.toAscii ().constData ()); + status_notify ("%s SHOW-PROMPT TEXT=\"%s\"", greeter_id, text.toAscii ().constData ()); } void TestGreeter::authenticationComplete () { if (authenticationUser () != "") - status_notify ("GREETER %s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s", - getenv ("DISPLAY"), + status_notify ("%s AUTHENTICATION-COMPLETE USERNAME=%s AUTHENTICATED=%s", + greeter_id, authenticationUser ().toAscii ().constData (), isAuthenticated () ? "TRUE" : "FALSE"); else - status_notify ("GREETER %s AUTHENTICATION-COMPLETE AUTHENTICATED=%s", getenv ("DISPLAY"), isAuthenticated () ? "TRUE" : "FALSE"); + status_notify ("%s AUTHENTICATION-COMPLETE AUTHENTICATED=%s", greeter_id, isAuthenticated () ? "TRUE" : "FALSE"); } void TestGreeter::autologinTimerExpired () { - status_notify ("GREETER %s AUTOLOGIN-TIMER-EXPIRED", getenv ("DISPLAY")); + status_notify ("%s AUTOLOGIN-TIMER-EXPIRED", greeter_id); } static void signal_cb (int signum) { - status_notify ("GREETER %s TERMINATE SIGNAL=%d", getenv ("DISPLAY"), signum); + status_notify ("%s TERMINATE SIGNAL=%d", greeter_id, signum); _exit (EXIT_SUCCESS); } @@ -69,32 +70,32 @@ request_cb (const gchar *request) return; } - r = g_strdup_printf ("GREETER %s AUTHENTICATE", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE", greeter_id); if (strcmp (request, r) == 0) greeter->authenticate (); g_free (r); - r = g_strdup_printf ("GREETER %s AUTHENTICATE USERNAME=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE USERNAME=", greeter_id); if (g_str_has_prefix (request, r)) greeter->authenticate (request + strlen (r)); g_free (r); - r = g_strdup_printf ("GREETER %s AUTHENTICATE-GUEST", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE-GUEST", greeter_id); if (strcmp (request, r) == 0) greeter->authenticateAsGuest (); g_free (r); - r = g_strdup_printf ("GREETER %s AUTHENTICATE-AUTOLOGIN", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE-AUTOLOGIN", greeter_id); if (strcmp (request, r) == 0) greeter->authenticateAutologin (); g_free (r); - r = g_strdup_printf ("GREETER %s AUTHENTICATE-REMOTE SESSION=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s AUTHENTICATE-REMOTE SESSION=", greeter_id); if (g_str_has_prefix (request, r)) greeter->authenticateRemote (request + strlen (r), NULL); g_free (r); - r = g_strdup_printf ("GREETER %s RESPOND TEXT=\"", getenv ("DISPLAY")); + r = g_strdup_printf ("%s RESPOND TEXT=\"", greeter_id); if (g_str_has_prefix (request, r)) { gchar *text = g_strdup (request + strlen (r)); @@ -104,88 +105,88 @@ request_cb (const gchar *request) } g_free (r); - r = g_strdup_printf ("GREETER %s CANCEL-AUTHENTICATION", getenv ("DISPLAY")); + r = g_strdup_printf ("%s CANCEL-AUTHENTICATION", greeter_id); if (strcmp (request, r) == 0) greeter->cancelAuthentication (); g_free (r); - r = g_strdup_printf ("GREETER %s START-SESSION", getenv ("DISPLAY")); + r = g_strdup_printf ("%s START-SESSION", greeter_id); if (strcmp (request, r) == 0) { if (!greeter->startSessionSync ()) - status_notify ("GREETER %s SESSION-FAILED", getenv ("DISPLAY")); + status_notify ("%s SESSION-FAILED", greeter_id); } g_free (r); - r = g_strdup_printf ("GREETER %s START-SESSION SESSION=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s START-SESSION SESSION=", greeter_id); if (g_str_has_prefix (request, r)) { if (!greeter->startSessionSync (request + strlen (r))) - status_notify ("GREETER %s SESSION-FAILED", getenv ("DISPLAY")); + status_notify ("%s SESSION-FAILED", greeter_id); } g_free (r); - r = g_strdup_printf ("GREETER %s GET-CAN-SUSPEND", getenv ("DISPLAY")); + r = g_strdup_printf ("%s GET-CAN-SUSPEND", greeter_id); if (strcmp (request, r) == 0) { gboolean can_suspend = power->canSuspend (); - status_notify ("GREETER %s CAN-SUSPEND ALLOWED=%s", getenv ("DISPLAY"), can_suspend ? "TRUE" : "FALSE"); + status_notify ("%s CAN-SUSPEND ALLOWED=%s", greeter_id, can_suspend ? "TRUE" : "FALSE"); } g_free (r); - r = g_strdup_printf ("GREETER %s SUSPEND", getenv ("DISPLAY")); + r = g_strdup_printf ("%s SUSPEND", greeter_id); if (strcmp (request, r) == 0) { if (!power->suspend ()) - status_notify ("GREETER %s FAIL-SUSPEND", getenv ("DISPLAY")); + status_notify ("%s FAIL-SUSPEND", greeter_id); } g_free (r); - r = g_strdup_printf ("GREETER %s GET-CAN-HIBERNATE", getenv ("DISPLAY")); + r = g_strdup_printf ("%s GET-CAN-HIBERNATE", greeter_id); if (strcmp (request, r) == 0) { gboolean can_hibernate = power->canHibernate (); - status_notify ("GREETER %s CAN-HIBERNATE ALLOWED=%s", getenv ("DISPLAY"), can_hibernate ? "TRUE" : "FALSE"); + status_notify ("%s CAN-HIBERNATE ALLOWED=%s", greeter_id, can_hibernate ? "TRUE" : "FALSE"); } g_free (r); - r = g_strdup_printf ("GREETER %s HIBERNATE", getenv ("DISPLAY")); + r = g_strdup_printf ("%s HIBERNATE", greeter_id); if (strcmp (request, r) == 0) { if (!power->hibernate ()) - status_notify ("GREETER %s FAIL-HIBERNATE", getenv ("DISPLAY")); + status_notify ("%s FAIL-HIBERNATE", greeter_id); } g_free (r); - r = g_strdup_printf ("GREETER %s GET-CAN-RESTART", getenv ("DISPLAY")); + r = g_strdup_printf ("%s GET-CAN-RESTART", greeter_id); if (strcmp (request, r) == 0) { gboolean can_restart = power->canRestart (); - status_notify ("GREETER %s CAN-RESTART ALLOWED=%s", getenv ("DISPLAY"), can_restart ? "TRUE" : "FALSE"); + status_notify ("%s CAN-RESTART ALLOWED=%s", greeter_id, can_restart ? "TRUE" : "FALSE"); } g_free (r); - r = g_strdup_printf ("GREETER %s RESTART", getenv ("DISPLAY")); + r = g_strdup_printf ("%s RESTART", greeter_id); if (strcmp (request, r) == 0) { if (!power->restart ()) - status_notify ("GREETER %s FAIL-RESTART", getenv ("DISPLAY")); + status_notify ("%s FAIL-RESTART", greeter_id); } g_free (r); - r = g_strdup_printf ("GREETER %s GET-CAN-SHUTDOWN", getenv ("DISPLAY")); + r = g_strdup_printf ("%s GET-CAN-SHUTDOWN", greeter_id); if (strcmp (request, r) == 0) { gboolean can_shutdown = power->canShutdown (); - status_notify ("GREETER %s CAN-SHUTDOWN ALLOWED=%s", getenv ("DISPLAY"), can_shutdown ? "TRUE" : "FALSE"); + status_notify ("%s CAN-SHUTDOWN ALLOWED=%s", greeter_id, can_shutdown ? "TRUE" : "FALSE"); } g_free (r); - r = g_strdup_printf ("GREETER %s SHUTDOWN", getenv ("DISPLAY")); + r = g_strdup_printf ("%s SHUTDOWN", greeter_id); if (strcmp (request, r) == 0) { if (!power->shutdown ()) - status_notify ("GREETER %s FAIL-SHUTDOWN", getenv ("DISPLAY")); + status_notify ("%s FAIL-SHUTDOWN", greeter_id); } g_free (r); } @@ -193,10 +194,20 @@ request_cb (const gchar *request) int main(int argc, char *argv[]) { + gchar *display; + #if !defined(GLIB_VERSION_2_36) g_type_init (); #endif + display = getenv ("DISPLAY"); + if (display == NULL) + greeter_id = g_strdup ("GREETER-?"); + else if (display[0] == ':') + greeter_id = g_strdup_printf ("GREETER-X-%s", display + 1); + else + greeter_id = g_strdup_printf ("GREETER-X-%s", display); + status_connect (request_cb); app = new QCoreApplication (argc, argv); @@ -204,7 +215,7 @@ main(int argc, char *argv[]) signal (SIGINT, signal_cb); signal (SIGTERM, signal_cb); - status_notify ("GREETER %s START", getenv ("DISPLAY")); + status_notify ("%s START", greeter_id); config = new QSettings (g_build_filename (getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), QSettings::IniFormat); @@ -212,29 +223,29 @@ main(int argc, char *argv[]) if (xcb_connection_has_error (connection)) { - status_notify ("GREETER %s FAIL-CONNECT-XSERVER", getenv ("DISPLAY")); + status_notify ("%s FAIL-CONNECT-XSERVER", greeter_id); return EXIT_FAILURE; } - status_notify ("GREETER %s CONNECT-XSERVER", getenv ("DISPLAY")); + status_notify ("%s CONNECT-XSERVER", greeter_id); power = new QLightDM::PowerInterface(); greeter = new TestGreeter(); - status_notify ("GREETER %s CONNECT-TO-DAEMON", getenv ("DISPLAY")); + status_notify ("%s CONNECT-TO-DAEMON", greeter_id); if (!greeter->connectSync()) { - status_notify ("GREETER %s FAIL-CONNECT-DAEMON", getenv ("DISPLAY")); + status_notify ("%s FAIL-CONNECT-DAEMON", greeter_id); return EXIT_FAILURE; } - status_notify ("GREETER %s CONNECTED-TO-DAEMON", getenv ("DISPLAY")); + status_notify ("%s CONNECTED-TO-DAEMON", greeter_id); if (greeter->selectUserHint() != "") - status_notify ("GREETER %s SELECT-USER-HINT USERNAME=%s", getenv ("DISPLAY"), greeter->selectUserHint ().toAscii ().constData ()); + status_notify ("%s SELECT-USER-HINT USERNAME=%s", greeter_id, greeter->selectUserHint ().toAscii ().constData ()); if (greeter->lockHint()) - status_notify ("GREETER %s LOCK-HINT", getenv ("DISPLAY")); + status_notify ("%s LOCK-HINT", greeter_id); return app->exec(); } diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index 2629e40c..d64f5f68 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -12,7 +12,7 @@ #include <pwd.h> /* Timeout in ms waiting for the status we expect */ -#define STATUS_TIMEOUT 2000 +#define STATUS_TIMEOUT 4000 /* Timeout in ms to wait for SIGTERM to be handled by a child process */ #define KILL_TIMEOUT 2000 @@ -23,8 +23,12 @@ static GKeyFile *config; static GSocket *status_socket = NULL; static gchar *status_socket_name = NULL; static GList *statuses = NULL; +typedef struct +{ + gchar *text; + gboolean done; +} ScriptLine; static GList *script = NULL; -static GList *script_iter = NULL; static guint status_timeout = 0; static gchar *temp_dir = NULL; static int service_count; @@ -263,12 +267,47 @@ fail (const gchar *event, const gchar *expected) quit (EXIT_FAILURE); } -static const gchar * -get_script_line () +static gchar * +get_prefix (const gchar *text) +{ + gchar *prefix; + gint i; + + prefix = g_strdup (text); + for (i = 0; prefix[i] != '\0' && prefix[i] != ' '; i++); + prefix[i] = '\0'; + + return prefix; +} + +static ScriptLine * +get_script_line (const gchar *prefix) { - if (!script_iter) - return NULL; - return script_iter->data; + GList *link; + + for (link = script; link; link = link->next) + { + ScriptLine *line = link->data; + + /* Ignore lines with other prefixes */ + if (prefix) + { + gchar *p; + gboolean matches; + + p = get_prefix (line->text); + matches = strcmp (prefix, p) == 0; + g_free (p); + + if (!matches) + continue; + } + + if (!line->done) + return line; + } + + return NULL; } static void @@ -456,9 +495,9 @@ handle_command (const gchar *command) } } /* Forward to external processes */ - else if (strcmp (name, "SESSION") == 0 || - strcmp (name, "GREETER") == 0 || - strcmp (name, "XSERVER") == 0) + else if (g_str_has_prefix (name, "SESSION-") || + g_str_has_prefix (name, "GREETER-") || + g_str_has_prefix (name, "XSERVER-")) { GList *link; for (link = status_clients; link; link = link->next) @@ -491,36 +530,41 @@ run_commands () /* Stop daemon if requested */ while (TRUE) { - const gchar *command; + ScriptLine *line; /* Commands start with an asterisk */ - command = get_script_line (); - if (!command || command[0] != '*') + line = get_script_line (NULL); + if (!line || line->text[0] != '*') break; - statuses = g_list_append (statuses, g_strdup (command)); - script_iter = script_iter->next; + statuses = g_list_append (statuses, g_strdup (line->text)); + line->done = TRUE; - handle_command (command + 1); + handle_command (line->text + 1); } /* Stop at the end of the script */ - if (get_script_line () == NULL) + if (get_script_line (NULL) == NULL) quit (EXIT_SUCCESS); } static gboolean status_timeout_cb (gpointer data) { - fail ("(timeout)", get_script_line ()); + ScriptLine *line; + + line = get_script_line (NULL); + fail ("(timeout)", line ? line->text : NULL); + return FALSE; } static void check_status (const gchar *status) { - const gchar *pattern; + ScriptLine *line; gboolean result = FALSE; + gchar *prefix; if (stop) return; @@ -531,20 +575,25 @@ check_status (const gchar *status) g_print ("%s\n", status); /* Try and match against expected */ - pattern = get_script_line (); - if (pattern) + prefix = get_prefix (status); + line = get_script_line (prefix); + g_free (prefix); + if (line) { - gchar *full_pattern = g_strdup_printf ("^%s$", pattern); + gchar *full_pattern = g_strdup_printf ("^%s$", line->text); result = g_regex_match_simple (full_pattern, status, 0, 0); g_free (full_pattern); } if (!result) { - fail (NULL, pattern); + if (line == NULL) + line = get_script_line (NULL); + fail (NULL, line ? line->text : NULL); return; } - script_iter = script_iter->next; + + line->done = TRUE; /* Restart timeout */ g_source_remove (status_timeout); @@ -627,11 +676,16 @@ load_script (const gchar *filename) /* Load lines with #? prefix as expected behaviour */ for (i = 0; lines[i]; i++) { - gchar *line = g_strstrip (lines[i]); - if (g_str_has_prefix (line, "#?")) - script = g_list_append (script, g_strdup (line+2)); + gchar *text = g_strstrip (lines[i]); + if (g_str_has_prefix (text, "#?")) + { + ScriptLine *line; + line = g_malloc0 (sizeof (ScriptLine)); + line->text = g_strdup (text + 2); + line->done = FALSE; + script = g_list_append (script, line); + } } - script_iter = script; g_strfreev (lines); } diff --git a/tests/src/test-session.c b/tests/src/test-session.c index 49f3f5c0..7d321cee 100644 --- a/tests/src/test-session.c +++ b/tests/src/test-session.c @@ -13,6 +13,8 @@ #include "status.h" +static gchar *session_id; + static GMainLoop *loop; static GString *open_fds; @@ -24,7 +26,7 @@ static xcb_connection_t *connection; static void quit_cb (int signum) { - status_notify ("SESSION %s TERMINATE SIGNAL=%d", getenv ("DISPLAY"), signum); + status_notify ("%s TERMINATE SIGNAL=%d", session_id, signum); exit (EXIT_SUCCESS); } @@ -39,20 +41,20 @@ request_cb (const gchar *request) return; } - r = g_strdup_printf ("SESSION %s LOGOUT", getenv ("DISPLAY")); + r = g_strdup_printf ("%s LOGOUT", session_id); if (strcmp (request, r) == 0) exit (EXIT_SUCCESS); g_free (r); - r = g_strdup_printf ("SESSION %s CRASH", getenv ("DISPLAY")); + r = g_strdup_printf ("%s CRASH", session_id); if (strcmp (request, r) == 0) kill (getpid (), SIGSEGV); g_free (r); - r = g_strdup_printf ("SESSION %s LOCK-SEAT", getenv ("DISPLAY")); + r = g_strdup_printf ("%s LOCK-SEAT", session_id); if (strcmp (request, r) == 0) { - status_notify ("SESSION %s LOCK-SEAT", getenv ("DISPLAY")); + status_notify ("%s LOCK-SEAT", session_id); g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL), "org.freedesktop.DisplayManager", getenv ("XDG_SEAT_PATH"), @@ -67,10 +69,10 @@ request_cb (const gchar *request) } g_free (r); - r = g_strdup_printf ("SESSION %s LOCK-SESSION", getenv ("DISPLAY")); + r = g_strdup_printf ("%s LOCK-SESSION", session_id); if (strcmp (request, r) == 0) { - status_notify ("SESSION %s LOCK-SESSION", getenv ("DISPLAY")); + status_notify ("%s LOCK-SESSION", session_id); g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL), "org.freedesktop.DisplayManager", getenv ("XDG_SESSION_PATH"), @@ -85,7 +87,7 @@ request_cb (const gchar *request) } g_free (r); - r = g_strdup_printf ("SESSION %s LIST-GROUPS", getenv ("DISPLAY")); + r = g_strdup_printf ("%s LIST-GROUPS", session_id); if (strcmp (request, r) == 0) { int n_groups, i; @@ -108,31 +110,31 @@ request_cb (const gchar *request) else g_string_append_printf (group_list, "%d", groups[i]); } - status_notify ("SESSION %s LIST-GROUPS GROUPS=%s", getenv ("DISPLAY"), group_list->str); + status_notify ("%s LIST-GROUPS GROUPS=%s", session_id, group_list->str); g_string_free (group_list, TRUE); free (groups); } - r = g_strdup_printf ("SESSION %s READ-ENV NAME=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s READ-ENV NAME=", session_id); if (g_str_has_prefix (request, r)) { const gchar *name = request + strlen (r); const gchar *value = g_getenv (name); - status_notify ("SESSION %s READ-ENV NAME=%s VALUE=%s", getenv ("DISPLAY"), name, value ? value : ""); + status_notify ("%s READ-ENV NAME=%s VALUE=%s", session_id, name, value ? value : ""); } g_free (r); - r = g_strdup_printf ("SESSION %s WRITE-STDOUT TEXT=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s WRITE-STDOUT TEXT=", session_id); if (g_str_has_prefix (request, r)) g_print ("%s", request + strlen (r)); g_free (r); - r = g_strdup_printf ("SESSION %s WRITE-STDERR TEXT=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s WRITE-STDERR TEXT=", session_id); if (g_str_has_prefix (request, r)) g_printerr ("%s", request + strlen (r)); g_free (r); - r = g_strdup_printf ("SESSION %s READ FILE=", getenv ("DISPLAY")); + r = g_strdup_printf ("%s READ FILE=", session_id); if (g_str_has_prefix (request, r)) { const gchar *name = request + strlen (r); @@ -140,24 +142,33 @@ request_cb (const gchar *request) GError *error = NULL; if (g_file_get_contents (name, &contents, NULL, &error)) - status_notify ("SESSION %s READ FILE=%s TEXT=%s", getenv ("DISPLAY"), name, contents); + status_notify ("%s READ FILE=%s TEXT=%s", session_id, name, contents); else - status_notify ("SESSION %s READ FILE=%s ERROR=%s", getenv ("DISPLAY"), name, error->message); + status_notify ("%s READ FILE=%s ERROR=%s", session_id, name, error->message); g_clear_error (&error); } g_free (r); - r = g_strdup_printf ("SESSION %s LIST-UNKNOWN-FILE-DESCRIPTORS", getenv ("DISPLAY")); + r = g_strdup_printf ("%s LIST-UNKNOWN-FILE-DESCRIPTORS", session_id); if (strcmp (request, r) == 0) - status_notify ("SESSION %s LIST-UNKNOWN-FILE-DESCRIPTORS FDS=%s", getenv ("DISPLAY"), open_fds->str); + status_notify ("%s LIST-UNKNOWN-FILE-DESCRIPTORS FDS=%s", session_id, open_fds->str); g_free (r); } int main (int argc, char **argv) { + gchar *display; int fd, open_max; + display = getenv ("DISPLAY"); + if (display == NULL) + session_id = g_strdup ("SESSION-?"); + else if (display[0] == ':') + session_id = g_strdup_printf ("SESSION-X-%s", display + 1); + else + session_id = g_strdup_printf ("SESSION-X-%s", display); + open_fds = g_string_new (""); open_max = sysconf (_SC_OPEN_MAX); for (fd = STDERR_FILENO + 1; fd < open_max; fd++) @@ -180,9 +191,9 @@ main (int argc, char **argv) status_connect (request_cb); if (argc > 1) - status_notify ("SESSION %s START NAME=%s USER=%s", getenv ("DISPLAY"), argv[1], getenv ("USER")); + status_notify ("%s START NAME=%s USER=%s", session_id, argv[1], getenv ("USER")); else - status_notify ("SESSION %s START USER=%s", getenv ("DISPLAY"), getenv ("USER")); + status_notify ("%s START USER=%s", session_id, getenv ("USER")); config = g_key_file_new (); g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL); @@ -191,13 +202,13 @@ main (int argc, char **argv) if (xcb_connection_has_error (connection)) { - status_notify ("SESSION %s CONNECT-XSERVER-ERROR", getenv ("DISPLAY")); + status_notify ("%s CONNECT-XSERVER-ERROR", session_id); return EXIT_FAILURE; } - status_notify ("SESSION %s CONNECT-XSERVER", getenv ("DISPLAY")); + status_notify ("%s CONNECT-XSERVER", session_id); - g_main_loop_run (loop); + g_main_loop_run (loop); return EXIT_SUCCESS; } diff --git a/tests/src/x-server.c b/tests/src/x-server.c index 9e76f80d..0c9182ab 100644 --- a/tests/src/x-server.c +++ b/tests/src/x-server.c @@ -10,43 +10,13 @@ #include <gio/gio.h> #include <gio/gunixsocketaddress.h> -#include "x-common.h" #include "x-server.h" G_DEFINE_TYPE (XServer, x_server, G_TYPE_OBJECT); -G_DEFINE_TYPE (XScreen, x_screen, G_TYPE_OBJECT); -G_DEFINE_TYPE (XVisual, x_visual, G_TYPE_OBJECT); G_DEFINE_TYPE (XClient, x_client, G_TYPE_OBJECT); #define MAXIMUM_REQUEST_LENGTH 65535 -enum -{ - Failed = 0, - Success = 1, - Authenticate = 2 -}; - -enum -{ - Error = 0, - Reply = 1, -}; - -enum -{ - InternAtom = 16, - GetProperty = 20, - QueryExtension = 98, - kbUseExtension = 200 -}; - -enum -{ - BadAtom = 5, - BadImplementation = 17 -}; - enum { X_SERVER_CLIENT_CONNECTED, X_SERVER_CLIENT_DISCONNECTED, @@ -54,40 +24,14 @@ enum { }; static guint x_server_signals[X_SERVER_LAST_SIGNAL] = { 0 }; -typedef struct -{ - guint8 depth; - guint8 bits_per_pixel; - guint8 scanline_pad; -} PixmapFormat; - struct XServerPrivate { - gchar *vendor; - gint display_number; - - guint32 motion_buffer_size; - guint8 image_byte_order; - guint8 bitmap_format_bit_order; - - guint8 min_keycode; - guint8 max_keycode; - GList *pixmap_formats; - GList *screens; - - gboolean listen_unix; - gboolean listen_tcp; - gint tcp_port; gchar *socket_path; - GSocket *unix_socket; - GIOChannel *unix_channel; - GSocket *tcp_socket; - GIOChannel *tcp_channel; + GSocket *socket; + GIOChannel *channel; GHashTable *clients; - GHashTable *atoms; - gint next_atom_index; }; struct XClientPrivate @@ -95,217 +39,33 @@ struct XClientPrivate XServer *server; GSocket *socket; GIOChannel *channel; - guint8 byte_order; - gboolean connected; - guint16 sequence_number; -}; - -struct XScreenPrivate -{ - guint32 white_pixel; - guint32 black_pixel; - guint32 current_input_masks; - guint16 width_in_pixels; - guint16 height_in_pixels; - guint16 width_in_millimeters; - guint16 height_in_millimeters; - GList *visuals; -}; - -struct XVisualPrivate -{ - guint32 id; - guint8 depth; - guint8 class; - guint8 bits_per_rgb_value; - guint16 colormap_entries; - guint32 red_mask; - guint32 green_mask; - guint32 blue_mask; }; enum { - X_CLIENT_CONNECT, X_CLIENT_DISCONNECTED, X_CLIENT_LAST_SIGNAL }; static guint x_client_signals[X_CLIENT_LAST_SIGNAL] = { 0 }; -GInetAddress * -x_client_get_address (XClient *client) -{ - GSocketAddress *socket_address; - GError *error = NULL; - - socket_address = g_socket_get_remote_address (client->priv->socket, &error); - if (error) - g_warning ("Error getting remote socket address"); - g_clear_error (&error); - if (!socket_address) - return NULL; - - if (G_IS_INET_SOCKET_ADDRESS (socket_address)) - return g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (socket_address)); - else - return NULL; -} - void x_client_send_failed (XClient *client, const gchar *reason) { - guint8 buffer[MAXIMUM_REQUEST_LENGTH]; - gsize n_written = 0, length_offset; - - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, Failed, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, strlen (reason), &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_PROTOCOL_MAJOR_VERSION, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_PROTOCOL_MINOR_VERSION, &n_written); - length_offset = n_written; - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); - write_padded_string (buffer, MAXIMUM_REQUEST_LENGTH, reason, &n_written); - - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, (n_written - length_offset) / 4, &length_offset); - - send (g_io_channel_unix_get_fd (client->priv->channel), buffer, n_written, 0); + gchar *message; + + message = g_strdup_printf ("FAILED:%s", reason); + send (g_io_channel_unix_get_fd (client->priv->channel), message, strlen (message), 0); + g_free (message); } void x_client_send_success (XClient *client) { - XServer *server = client->priv->server; - guint8 buffer[MAXIMUM_REQUEST_LENGTH]; - gsize n_written = 0, length_offset; - GList *link; - - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, Success, &n_written); - write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_PROTOCOL_MAJOR_VERSION, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_PROTOCOL_MINOR_VERSION, &n_written); - length_offset = n_written; - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, X_RELEASE_NUMBER, &n_written); - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0x00a00000, &n_written); // resource-id-base - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0x001fffff, &n_written); // resource-id-mask - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, server->priv->motion_buffer_size, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, strlen (client->priv->server->priv->vendor), &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, MAXIMUM_REQUEST_LENGTH, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, g_list_length (server->priv->screens), &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, g_list_length (server->priv->pixmap_formats), &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, server->priv->image_byte_order, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, server->priv->bitmap_format_bit_order, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 32, &n_written); // bitmap-format-scanline-unit - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 32, &n_written); // bitmap-format-scanline-pad - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, server->priv->min_keycode, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, server->priv->max_keycode, &n_written); - write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 4, &n_written); - write_padded_string (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->server->priv->vendor, &n_written); - - for (link = server->priv->pixmap_formats; link; link = link->next) - { - PixmapFormat *format = link->data; - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, format->depth, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, format->bits_per_pixel, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, format->scanline_pad, &n_written); - write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 5, &n_written); - } - - for (link = server->priv->screens; link; link = link->next) - { - XScreen *screen = link->data; - guint8 depth, n_depths = 0; - gsize n_depths_offset; - - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 87, &n_written); // root - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 32, &n_written); // default-colormap - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->white_pixel, &n_written); - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->black_pixel, &n_written); - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->current_input_masks, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->width_in_pixels, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->height_in_pixels, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->width_in_millimeters, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, screen->priv->height_in_millimeters, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 1, &n_written); // min-installed-maps - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 1, &n_written); // max-installed-maps - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 34, &n_written); // root-visual - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written); // backing-stores - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written); // save-unders - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 24, &n_written); // root-depth - n_depths_offset = n_written; - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written); - - depth = 0; - while (TRUE) - { - GList *visual_link; - guint16 n_visuals = 0; - - /* Find the next depth to this one */ - guint8 next_depth = 255; - for (visual_link = screen->priv->visuals; visual_link; visual_link = visual_link->next) - { - XVisual *visual = visual_link->data; - if (visual->priv->depth > depth && visual->priv->depth < next_depth) - next_depth = visual->priv->depth; - } - if (next_depth == 255) - break; - depth = next_depth; - n_depths++; - - for (visual_link = screen->priv->visuals; visual_link; visual_link = visual_link->next) - { - XVisual *visual = visual_link->data; - if (visual->priv->depth == depth) - n_visuals++; - } - - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, depth, &n_written); - write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, n_visuals, &n_written); - write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 4, &n_written); - - for (visual_link = screen->priv->visuals; visual_link; visual_link = visual_link->next) - { - XVisual *visual = visual_link->data; - - if (visual->priv->depth != depth) - continue; - - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->id, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, visual->priv->class, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, visual->priv->bits_per_rgb_value, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->colormap_entries, &n_written); - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->red_mask, &n_written); - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->green_mask, &n_written); - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, visual->priv->blue_mask, &n_written); - write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 4, &n_written); - } - } - - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, n_depths, &n_depths_offset); - } - - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, (n_written - length_offset) / 4, &length_offset); - - send (g_io_channel_unix_get_fd (client->priv->channel), buffer, n_written, 0); -} - -void -x_client_send_error (XClient *client, int type, int major, int minor) -{ - guint8 buffer[MAXIMUM_REQUEST_LENGTH]; - gsize n_written = 0; - - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, Error, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, type, &n_written); - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written); - write_card32 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* resourceID */ - write_card16 (buffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, minor, &n_written); - write_card8 (buffer, MAXIMUM_REQUEST_LENGTH, major, &n_written); - write_padding (buffer, MAXIMUM_REQUEST_LENGTH, 21, &n_written); + gchar *message; - send (g_io_channel_unix_get_fd (client->priv->channel), buffer, n_written, 0); + message = g_strdup ("SUCCESS"); + send (g_io_channel_unix_get_fd (client->priv->channel), message, strlen (message), 0); + g_free (message); } void @@ -318,7 +78,6 @@ static void x_client_init (XClient *client) { client->priv = G_TYPE_INSTANCE_GET_PRIVATE (client, x_client_get_type (), XClientPrivate); - client->priv->sequence_number = 1; } static void @@ -326,14 +85,6 @@ x_client_class_init (XClientClass *klass) { g_type_class_add_private (klass, sizeof (XClientPrivate)); - x_client_signals[X_CLIENT_CONNECT] = - g_signal_new ("connect", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (XClientClass, connect), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); x_client_signals[X_CLIENT_DISCONNECTED] = g_signal_new ("disconnected", G_TYPE_FROM_CLASS (klass), @@ -349,387 +100,9 @@ x_server_new (gint display_number) { XServer *server = g_object_new (x_server_get_type (), NULL); server->priv->display_number = display_number; - server->priv->tcp_port = 6000 + display_number; return server; } -XScreen * -x_server_add_screen (XServer *server, guint32 white_pixel, guint32 black_pixel, guint32 current_input_masks, guint16 width_in_pixels, guint16 height_in_pixels, guint16 width_in_millimeters, guint16 height_in_millimeters) -{ - XScreen *screen; - - screen = g_object_new (x_screen_get_type (), NULL); - - screen->priv->white_pixel = white_pixel; - screen->priv->black_pixel = black_pixel; - screen->priv->current_input_masks = current_input_masks; - screen->priv->width_in_pixels = width_in_pixels; - screen->priv->height_in_pixels = height_in_pixels; - screen->priv->width_in_millimeters = width_in_millimeters; - screen->priv->height_in_millimeters = height_in_millimeters; - - server->priv->screens = g_list_append (server->priv->screens, screen); - - return screen; -} - -void -x_server_add_pixmap_format (XServer *server, guint8 depth, guint8 bits_per_pixel, guint8 scanline_pad) -{ - PixmapFormat *format; - - format = g_malloc0 (sizeof (PixmapFormat)); - format->depth = depth; - format->bits_per_pixel = bits_per_pixel; - format->scanline_pad = scanline_pad; - server->priv->pixmap_formats = g_list_append (server->priv->pixmap_formats, format); -} - -void -x_server_set_listen_unix (XServer *server, gboolean listen_unix) -{ - server->priv->listen_unix = listen_unix; -} - -void -x_server_set_listen_tcp (XServer *server, gboolean listen_tcp) -{ - server->priv->listen_tcp = listen_tcp; -} - -XVisual * -x_screen_add_visual (XScreen *screen, guint8 depth, guint8 class, guint8 bits_per_rgb_value, guint16 colormap_entries, guint32 red_mask, guint32 green_mask, guint32 blue_mask) -{ - XVisual *visual; - - visual = g_object_new (x_visual_get_type (), NULL); - visual->priv->id = 0; // FIXME - visual->priv->depth = depth; - visual->priv->class = class; - visual->priv->bits_per_rgb_value = bits_per_rgb_value; - visual->priv->colormap_entries = colormap_entries; - visual->priv->red_mask = red_mask; - visual->priv->green_mask = green_mask; - visual->priv->blue_mask = blue_mask; - - return visual; -} - -static void -decode_connection_request (XClient *client, const guint8 *buffer, gssize buffer_length) -{ - guint8 byte_order; - gsize offset = 0; - guint16 n; - XConnect *message; - - byte_order = read_card8 (buffer, buffer_length, &offset); - if (!(byte_order == 'B' || byte_order == 'l')) - { - g_warning ("Invalid byte order"); - return; - } - - message = g_malloc0 (sizeof (XConnect)); - - message->byte_order = byte_order == 'B' ? X_BYTE_ORDER_MSB : X_BYTE_ORDER_LSB; - read_padding (1, &offset); - message->protocol_major_version = read_card16 (buffer, buffer_length, message->byte_order, &offset); - message->protocol_minor_version = read_card16 (buffer, buffer_length, message->byte_order, &offset); - n = read_card16 (buffer, buffer_length, message->byte_order, &offset); - message->authorization_protocol_data_length = read_card16 (buffer, buffer_length, message->byte_order, &offset); - read_padding (2, &offset); - message->authorization_protocol_name = read_padded_string (buffer, buffer_length, n, &offset); - message->authorization_protocol_data = read_string8 (buffer, buffer_length, message->authorization_protocol_data_length, &offset); - read_padding (pad (message->authorization_protocol_data_length), &offset); - - /* Store information about the client */ - client->priv->byte_order = message->byte_order; - client->priv->connected = TRUE; - - g_signal_emit (client, x_client_signals[X_CLIENT_CONNECT], 0, message); - - g_free (message->authorization_protocol_name); - g_free (message->authorization_protocol_data); - g_free (message); -} - -static void -process_intern_atom (XClient *client, const guint8 *buffer, gssize buffer_length) -{ - /* Decode */ - - gsize offset = 0; - guint8 onlyIfExists; - guint16 n; - gchar *name; - int atom; - - read_padding (1, &offset); /* reqType */ - onlyIfExists = read_card8 (buffer, buffer_length, &offset); - read_padding (2, &offset); /* length */ - n = read_card16 (buffer, buffer_length, client->priv->byte_order, &offset); - read_padding (2, &offset); - name = read_padded_string (buffer, buffer_length, n, &offset); - - /* Process */ - - atom = client->priv->server->priv->next_atom_index++; - - if (onlyIfExists) - { - g_free (name); - if (!g_hash_table_lookup (client->priv->server->priv->atoms, GINT_TO_POINTER (atom))) - { - x_client_send_error (client, BadAtom, InternAtom, 0); - return; - } - } - else - g_hash_table_insert (client->priv->server->priv->atoms, GINT_TO_POINTER (atom), name); - - /* Reply */ - - guint8 outBuffer[MAXIMUM_REQUEST_LENGTH]; - gsize n_written = 0; - - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, Reply, &n_written); - write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written); - write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written); - write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* length */ - write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, atom, &n_written); - write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 20, &n_written); - - send (g_io_channel_unix_get_fd (client->priv->channel), outBuffer, n_written, 0); -} - -static void -process_get_property (XClient *client, const guint8 *buffer, gssize buffer_length) -{ - /* Decode */ - - gsize offset = 0; - guint8 delete; - guint32 property; - guint32 type; - - read_padding (1, &offset); /* reqType */ - delete = read_card8 (buffer, buffer_length, &offset); - read_padding (2, &offset); /* length */ - read_padding (4, &offset); /* window */ - property = read_card32 (buffer, buffer_length, client->priv->byte_order, &offset); - type = read_card32 (buffer, buffer_length, client->priv->byte_order, &offset); - read_padding (4, &offset); /* longOffset */ - read_padding (4, &offset); /* longLength */ - - /* Process */ - - gchar *name = g_hash_table_lookup (client->priv->server->priv->atoms, GINT_TO_POINTER (property)); - GString *reply = NULL; - guint8 format = 8; - - if (g_strcmp0 (name, "_XKB_RULES_NAMES") == 0) - { - GKeyFile *config; - - config = g_key_file_new (); - g_key_file_load_from_file (config, g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "script", NULL), G_KEY_FILE_NONE, NULL); - - reply = g_string_new (""); - - g_string_append (reply, "evdev"); /* rules file */ - g_string_append_c (reply, 0); /* embedded null byte */ - - g_string_append (reply, "pc105"); /* model name */ - g_string_append_c (reply, 0); /* embedded null byte */ - - if (g_key_file_has_key (config, "test-xserver-config", "keyboard-layout", NULL)) - g_string_append (reply, g_key_file_get_string (config, "test-xserver-config", "keyboard-layout", NULL)); - else - g_string_append (reply, "us"); - g_string_append_c (reply, 0); /* embedded null byte */ - - if (g_key_file_has_key (config, "test-xserver-config", "keyboard-variant", NULL)) - g_string_append (reply, g_key_file_get_string (config, "test-xserver-config", "keyboard-variant", NULL)); - g_string_append_c (reply, 0); /* embedded null byte */ - - /* no xkb options */ - g_string_append_c (reply, 0); /* embedded null byte */ - - g_key_file_free (config); - } - - if (name && delete) - g_hash_table_remove (client->priv->server->priv->atoms, GINT_TO_POINTER (property)); - - /* Reply */ - - if (!reply) - { - x_client_send_error (client, BadImplementation, GetProperty, 0); - return; - } - - guint8 outBuffer[MAXIMUM_REQUEST_LENGTH]; - gsize n_written = 0, length_offset, packet_start; - - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, Reply, &n_written); - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, format, &n_written); - write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written); - length_offset = n_written; - write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* length */ - write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, type, &n_written); - write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* bytesAfter */ - write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, reply->len, &n_written); - write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 12, &n_written); - packet_start = n_written; - - write_string8 (outBuffer, MAXIMUM_REQUEST_LENGTH, (guint8 *) reply->str, reply->len, &n_written); - write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, pad (reply->len), &n_written); - - write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, (n_written - packet_start) / 4, &length_offset); - - send (g_io_channel_unix_get_fd (client->priv->channel), outBuffer, n_written, 0); - - /* Cleanup */ - - g_string_free (reply, TRUE); -} - -static void -process_query_extension (XClient *client, const guint8 *buffer, gssize buffer_length) -{ - /* Decode */ - - gsize offset = 0; - guint8 n; - gchar *name; - - read_padding (1, &offset); /* reqType */ - read_padding (1, &offset); /* pad */ - read_padding (2, &offset); /* length */ - n = read_card16 (buffer, buffer_length, client->priv->byte_order, &offset); - read_padding (2, &offset); /* pad */ - name = read_padded_string (buffer, buffer_length, n, &offset); - - /* Process */ - - guint8 present = 0; - if (g_strcmp0 (name, "XKEYBOARD") == 0) - present = 1; - - /* Reply */ - - guint8 outBuffer[MAXIMUM_REQUEST_LENGTH]; - gsize n_written = 0; - - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, Reply, &n_written); - write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written); - write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written); - write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* length */ - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, present, &n_written); - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, kbUseExtension, &n_written); /* major_opcode */ - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written); /* first_event */ - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, 0, &n_written); /* first_error */ - write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 20, &n_written); - - send (g_io_channel_unix_get_fd (client->priv->channel), outBuffer, n_written, 0); - - /* Cleanup */ - - g_free (name); -} - -static void -process_kb_use_extension (XClient *client, const guint8 *buffer, gssize buffer_length) -{ - /* Nothing to decode, we don't care about parameters */ - - /* Reply */ - - guint8 outBuffer[MAXIMUM_REQUEST_LENGTH]; - gsize n_written = 0; - - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, Reply, &n_written); - write_card8 (outBuffer, MAXIMUM_REQUEST_LENGTH, 1, &n_written); /* supported */ - write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, client->priv->sequence_number, &n_written); - write_card32 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* length */ - write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 1, &n_written); /* serverMajor */ - write_card16 (outBuffer, MAXIMUM_REQUEST_LENGTH, client->priv->byte_order, 0, &n_written); /* serverMinor */ - write_padding (outBuffer, MAXIMUM_REQUEST_LENGTH, 20, &n_written); - - send (g_io_channel_unix_get_fd (client->priv->channel), outBuffer, n_written, 0); -} - -static void -decode_request (XClient *client, const guint8 *buffer, gssize buffer_length) -{ - int opcode; - gsize offset = 0; - - while (offset < buffer_length) - { - gsize start_offset; - guint16 length; - - start_offset = offset; - opcode = read_card8 (buffer, buffer_length, &offset); - read_card8 (buffer, buffer_length, &offset); - length = read_card16 (buffer, buffer_length, client->priv->byte_order, &offset) * 4; - - g_debug ("Got opcode=%d length=%d", opcode, length); - offset = start_offset + length; - - switch (opcode) - { - case InternAtom: - process_intern_atom (client, buffer + start_offset, length); - break; - case GetProperty: - process_get_property (client, buffer + start_offset, length); - break; - case QueryExtension: - process_query_extension (client, buffer + start_offset, length); - break; - case kbUseExtension: - process_kb_use_extension (client, buffer + start_offset, length); - break; - default: - /* Send an error because we don't understand the opcode yet */ - x_client_send_error (client, BadImplementation, opcode, 0); - break; - } - - client->priv->sequence_number++; - } -} - -static gboolean -socket_data_cb (GIOChannel *channel, GIOCondition condition, gpointer data) -{ - XClient *client = data; - guint8 buffer[MAXIMUM_REQUEST_LENGTH]; - gssize n_read; - - n_read = recv (g_io_channel_unix_get_fd (channel), buffer, MAXIMUM_REQUEST_LENGTH, 0); - if (n_read < 0) - g_warning ("Error reading from socket: %s", strerror (errno)); - else if (n_read == 0) - { - g_signal_emit (client, x_client_signals[X_CLIENT_DISCONNECTED], 0); - return FALSE; - } - else - { - if (client->priv->connected) - decode_request (client, buffer, n_read); - else - decode_connection_request (client, buffer, n_read); - } - - return TRUE; -} - static void x_client_disconnected_cb (XClient *client, XServer *server) { @@ -746,10 +119,7 @@ socket_connect_cb (GIOChannel *channel, GIOCondition condition, gpointer data) XClient *client; GError *error = NULL; - if (channel == server->priv->unix_channel) - data_socket = g_socket_accept (server->priv->unix_socket, NULL, &error); - else - data_socket = g_socket_accept (server->priv->tcp_socket, NULL, &error); + data_socket = g_socket_accept (server->priv->socket, NULL, &error); if (error) g_warning ("Error accepting connection: %s", strerror (errno)); g_clear_error (&error); @@ -762,7 +132,6 @@ socket_connect_cb (GIOChannel *channel, GIOCondition condition, gpointer data) client->priv->socket = data_socket; client->priv->channel = g_io_channel_unix_new (g_socket_get_fd (data_socket)); g_hash_table_insert (server->priv->clients, client->priv->channel, client); - g_io_add_watch (client->priv->channel, G_IO_IN, socket_data_cb, client); g_signal_emit (server, x_server_signals[X_SERVER_CLIENT_CONNECTED], 0, client); @@ -772,39 +141,23 @@ socket_connect_cb (GIOChannel *channel, GIOCondition condition, gpointer data) gboolean x_server_start (XServer *server) { - if (server->priv->listen_unix) - { - GError *error = NULL; - - server->priv->socket_path = g_strdup_printf ("/tmp/.X11-unix/X%d", server->priv->display_number); + gchar *name; + GError *error = NULL; - server->priv->unix_socket = g_socket_new (G_SOCKET_FAMILY_UNIX, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &error); - if (!server->priv->unix_socket || - !g_socket_bind (server->priv->unix_socket, g_unix_socket_address_new (server->priv->socket_path), TRUE, &error) || - !g_socket_listen (server->priv->unix_socket, &error)) - { - g_warning ("Error creating Unix X socket: %s", error->message); - return FALSE; - } - server->priv->unix_channel = g_io_channel_unix_new (g_socket_get_fd (server->priv->unix_socket)); - g_io_add_watch (server->priv->unix_channel, G_IO_IN, socket_connect_cb, server); - } + name = g_strdup_printf (":%d", server->priv->display_number); + server->priv->socket_path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", name, NULL); + g_free (name); - if (server->priv->listen_tcp) + server->priv->socket = g_socket_new (G_SOCKET_FAMILY_UNIX, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, &error); + if (!server->priv->socket || + !g_socket_bind (server->priv->socket, g_unix_socket_address_new (server->priv->socket_path), TRUE, &error) || + !g_socket_listen (server->priv->socket, &error)) { - GError *error = NULL; - - server->priv->tcp_socket = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_TCP, &error); - if (!server->priv->tcp_socket || - !g_socket_bind (server->priv->tcp_socket, g_inet_socket_address_new (g_inet_address_new_any (G_SOCKET_FAMILY_IPV4), server->priv->tcp_port), TRUE, &error) || - !g_socket_listen (server->priv->tcp_socket, &error)) - { - g_warning ("Error creating TCP/IP X socket: %s", error->message); - return FALSE; - } - server->priv->tcp_channel = g_io_channel_unix_new (g_socket_get_fd (server->priv->tcp_socket)); - g_io_add_watch (server->priv->tcp_channel, G_IO_IN, socket_connect_cb, server); + g_warning ("Error creating Unix X socket: %s", error->message); + return FALSE; } + server->priv->channel = g_io_channel_unix_new (g_socket_get_fd (server->priv->socket)); + g_io_add_watch (server->priv->channel, G_IO_IN, socket_connect_cb, server); return TRUE; } @@ -819,93 +172,15 @@ static void x_server_init (XServer *server) { server->priv = G_TYPE_INSTANCE_GET_PRIVATE (server, x_server_get_type (), XServerPrivate); - server->priv->vendor = g_strdup (""); - server->priv->min_keycode = 8; - server->priv->min_keycode = 255; - server->priv->screens = NULL; - server->priv->listen_unix = TRUE; - server->priv->listen_tcp = TRUE; server->priv->clients = g_hash_table_new_full (g_direct_hash, g_direct_equal, (GDestroyNotify) g_io_channel_unref, g_object_unref); - server->priv->atoms = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free); - server->priv->next_atom_index = 1; - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("PRIMARY")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SECONDARY")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("ARC")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("ATOM")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("BITMAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CARDINAL")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("COLORMAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CURSOR")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER0")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER1")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER2")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER3")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER4")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER5")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER6")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CUT_BUFFER7")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("DRAWABLE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("FONT")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("INTEGER")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("PIXMAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("POINT")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RECTANGLE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RESOURCE_MANAGER")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_COLOR_MAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_BEST_MAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_BLUE_MAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_DEFAULT_MAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_GRAY_MAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_GREEN_MAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RGB_RED_MAP")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("STRING")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("VISUALID")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WINDOW")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_COMMAND")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_HINTS")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_CLIENT_MACHINE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_ICON_NAME")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_ICON_SIZE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_NAME")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_NORMAL_HINTS")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_SIZE_HINTS")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_ZOOM_HINTS")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("MIN_SPACE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("NORM_SPACE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("MAX_SPACE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("END_SPACE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SUPERSCRIPT_X")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SUPERSCRIPT_Y")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SUBSCRIPT_X")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("SUBSCRIPT_Y")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("UNDERLINE_POSITION")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("UNDERLINE_THICKNESS")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("STRIKEOUT_ASCENT")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("STRIKEOUT_DESCENT")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("ITALIC_ANGLE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("X_HEIGHT")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("QUAD_WIDTH")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WEIGHT")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("POINT_SIZE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("RESOLUTION")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("COPYRIGHT")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("NOTICE")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("FONT_NAME")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("FAMILY_NAME")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("FULL_NAME")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("CAP_HEIGHT")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_CLASS")); - g_hash_table_insert (server->priv->atoms, GINT_TO_POINTER (server->priv->next_atom_index++), g_strdup ("WM_TRANSIENT_FOR")); } static void x_server_finalize (GObject *object) { XServer *server = (XServer *) object; - g_free (server->priv->vendor); if (server->priv->socket_path) unlink (server->priv->socket_path); - g_hash_table_unref (server->priv->atoms); G_OBJECT_CLASS (x_server_parent_class)->finalize (object); } @@ -932,27 +207,3 @@ x_server_class_init (XServerClass *klass) g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, x_client_get_type ()); } - -static void -x_screen_init (XScreen *screen) -{ - screen->priv = G_TYPE_INSTANCE_GET_PRIVATE (screen, x_screen_get_type (), XScreenPrivate); -} - -static void -x_screen_class_init (XScreenClass *klass) -{ - g_type_class_add_private (klass, sizeof (XScreenPrivate)); -} - -static void -x_visual_init (XVisual *visual) -{ - visual->priv = G_TYPE_INSTANCE_GET_PRIVATE (visual, x_visual_get_type (), XVisualPrivate); -} - -static void -x_visual_class_init (XVisualClass *klass) -{ - g_type_class_add_private (klass, sizeof (XVisualPrivate)); -} diff --git a/tests/src/x-server.h b/tests/src/x-server.h index 402b2391..5f5b4728 100644 --- a/tests/src/x-server.h +++ b/tests/src/x-server.h @@ -6,20 +6,6 @@ G_BEGIN_DECLS -#define X_PROTOCOL_MAJOR_VERSION 11 -#define X_PROTOCOL_MINOR_VERSION 0 - -#define X_RELEASE_NUMBER 0 - -typedef struct -{ - guint8 byte_order; - guint16 protocol_major_version, protocol_minor_version; - gchar *authorization_protocol_name; - guint8 *authorization_protocol_data; - guint16 authorization_protocol_data_length; -} XConnect; - typedef struct XClientPrivate XClientPrivate; typedef struct @@ -31,36 +17,9 @@ typedef struct typedef struct { GObjectClass parent_class; - void (*connect)(XClient *client, XConnect *message); void (*disconnected)(XClient *client); } XClientClass; -typedef struct XScreenPrivate XScreenPrivate; - -typedef struct -{ - GObject parent_instance; - XScreenPrivate *priv; -} XScreen; - -typedef struct -{ - GObjectClass parent_class; -} XScreenClass; - -typedef struct XVisualPrivate XVisualPrivate; - -typedef struct -{ - GObject parent_instance; - XVisualPrivate *priv; -} XVisual; - -typedef struct -{ - GObjectClass parent_class; -} XVisualClass; - typedef struct XServerPrivate XServerPrivate; typedef struct @@ -80,28 +39,12 @@ GType x_server_get_type (void); XServer *x_server_new (gint display_number); -XScreen *x_server_add_screen (XServer *server, guint32 white_pixel, guint32 black_pixel, guint32 current_input_masks, guint16 width_in_pixels, guint16 height_in_pixels, guint16 width_in_millimeters, guint16 height_in_millimeters); - -void x_server_add_pixmap_format (XServer *server, guint8 depth, guint8 bits_per_pixel, guint8 scanline_pad); - -void x_server_set_listen_unix (XServer *server, gboolean listen_unix); - -void x_server_set_listen_tcp (XServer *server, gboolean listen_tcp); - gboolean x_server_start (XServer *server); gsize x_server_get_n_clients (XServer *server); -GType x_screen_get_type (void); - -XVisual *x_screen_add_visual (XScreen *screen, guint8 depth, guint8 class, guint8 bits_per_rgb_value, guint16 colormap_entries, guint32 red_mask, guint32 green_mask, guint32 blue_mask); - -GType x_visual_get_type (void); - GType x_client_get_type (void); -GInetAddress *x_client_get_address (XClient *client); - void x_client_send_failed (XClient *client, const gchar *reason); void x_client_send_success (XClient *client); diff --git a/tests/test-default-keyboard-layout b/tests/test-default-keyboard-layout deleted file mode 100755 index 705b48a9..00000000 --- a/tests/test-default-keyboard-layout +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner default-keyboard-layout test-gobject-greeter diff --git a/tests/test-keyboard-variants b/tests/test-keyboard-variants deleted file mode 100755 index 7d9742ef..00000000 --- a/tests/test-keyboard-variants +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner keyboard-variants test-gobject-greeter |