diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2012-02-01 18:00:45 +1100 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2012-02-01 18:00:45 +1100 |
| commit | f22d153e94a71788c1688f02b555d33f7964e5a8 (patch) | |
| tree | 3bf3699c33aef2690393d9d4a40e24493cacc700 /tests/scripts/greeter-xserver-crash.conf | |
| parent | 389ff56481e58fd4030fc2036f57ac270cb5cd76 (diff) | |
| download | lightdm-f22d153e94a71788c1688f02b555d33f7964e5a8.tar.gz | |
Distinguish between different greeters in tests
Diffstat (limited to 'tests/scripts/greeter-xserver-crash.conf')
| -rw-r--r-- | tests/scripts/greeter-xserver-crash.conf | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf index 4415140d..e846de6e 100644 --- a/tests/scripts/greeter-xserver-crash.conf +++ b/tests/scripts/greeter-xserver-crash.conf @@ -18,18 +18,18 @@ crash-xserver=true #?XSERVER :50 ACCEPT-CONNECT # Greeter starts -#?GREETER START +#?GREETER :50 START #?XSERVER :50 ACCEPT-CONNECT -#?GREETER CONNECT-XSERVER :50 -#?GREETER CONNECT-TO-DAEMON -#?GREETER CONNECTED-TO-DAEMON +#?GREETER :50 CONNECT-XSERVER +#?GREETER :50 CONNECT-TO-DAEMON +#?GREETER :50 CONNECTED-TO-DAEMON # X server crashes (triggered by greeter) -#?GREETER CRASH-XSERVER +#?GREETER :50 CRASH-XSERVER #?XSERVER :50 CRASH # Greeter quits -#?GREETER TERMINATE SIGNAL=15 +#?GREETER :50 TERMINATE SIGNAL=15 # X server restarts #?XSERVER :50 START @@ -39,15 +39,15 @@ crash-xserver=true #?XSERVER :50 ACCEPT-CONNECT # Greeter starts -#?GREETER START +#?GREETER :50 START #?XSERVER :50 ACCEPT-CONNECT -#?GREETER CONNECT-XSERVER :50 -#?GREETER CONNECT-TO-DAEMON -#?GREETER CONNECTED-TO-DAEMON +#?GREETER :50 CONNECT-XSERVER +#?GREETER :50 CONNECT-TO-DAEMON +#?GREETER :50 CONNECTED-TO-DAEMON # Cleanup #?*STOP-DAEMON # Don't know what order they will terminate -#?(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) -#?(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15) +#?(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 |