summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2012-03-27 16:50:16 +1100
committerRobert Ancell <robert.ancell@canonical.com>2012-03-27 16:50:16 +1100
commit5103712e0707ea8022f34d50d26c4a424e8e3e86 (patch)
tree5ea1e16fd72543856a92a46facf642d223292f84 /tests
parent08599f5ff7d7945bc994f5e7671e50673a5d3fe2 (diff)
downloadlightdm-5103712e0707ea8022f34d50d26c4a424e8e3e86.tar.gz
Improve session log backup test
Diffstat (limited to 'tests')
-rw-r--r--tests/scripts/session-stderr-backup.conf42
1 files changed, 29 insertions, 13 deletions
diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf
index 3c0dea46..47238815 100644
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -27,33 +27,21 @@ autologin-user=no-password1
#?*SESSION :50 READ FILE=.xsession-errors
#?SESSION :50 READ FILE=.xsession-errors TEXT=FIRST-SESSION
-# Logout session
+# Restart session
#?*SESSION :50 LOGOUT
-
-# X server stops
#?XSERVER :50 TERMINATE SIGNAL=15
-
-# 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
-
-# Log in
#?*GREETER :50 AUTHENTICATE USERNAME=no-password1
#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
#?*GREETER :50 START-SESSION
#?GREETER :50 TERMINATE SIGNAL=15
-
-# Session starts
#?SESSION :50 START USER=no-password1
#?XSERVER :50 ACCEPT-CONNECT
#?SESSION :50 CONNECT-XSERVER
@@ -67,6 +55,34 @@ autologin-user=no-password1
#?*SESSION :50 READ FILE=.xsession-errors.old
#?SESSION :50 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
+
+# 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
+
+# Check second log is backed up
+#?*SESSION :50 READ FILE=.xsession-errors.old
+#?SESSION :50 READ FILE=.xsession-errors.old TEXT=SECOND-SESSION
+
# Cleanup
#?*STOP-DAEMON
# Don't know what order they will terminate