summaryrefslogtreecommitdiff
path: root/tests/scripts/system-xauthority.conf
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2013-02-20 17:55:47 +0000
committerRobert Ancell <robert.ancell@canonical.com>2013-02-20 17:55:47 +0000
commit9cd6dbcbc0ef1571e83686e4acb7c1e648859d4c (patch)
tree417d45e189de587a3f924bcd2d4b72c76ce6cdf9 /tests/scripts/system-xauthority.conf
parent8b078143c6983f632e6aa1fa250c187a5dcf8d1d (diff)
downloadlightdm-9cd6dbcbc0ef1571e83686e4acb7c1e648859d4c.tar.gz
Refactor tests
Diffstat (limited to 'tests/scripts/system-xauthority.conf')
-rw-r--r--tests/scripts/system-xauthority.conf21
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf
index 17f4de54..bcc2735e 100644
--- a/tests/scripts/system-xauthority.conf
+++ b/tests/scripts/system-xauthority.conf
@@ -12,24 +12,23 @@ autologin-user=have-password1
#?RUNNER DAEMON-START
# X server starts
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER-50 START
+#?XSERVER-50 INDICATE-READY
# LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER-50 ACCEPT-CONNECT
# Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-50 START USER=have-password1
+#?XSERVER-50 ACCEPT-CONNECT
+#?SESSION-X-50 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-50 READ-ENV NAME=XAUTHORITY
+#?SESSION-X-50 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-50 TERMINATE SIGNAL=15
+#?XSERVER-50 TERMINATE SIGNAL=15
#?RUNNER DAEMON-EXIT STATUS=0