Add tests to check that sessions switched to correctly log out

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6b68b4a4d480887c1e9483dcd3a264fe6d562620..1b4bc54edbd034e3446c58ac026cdb896687b82b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -112,7 +112,10 @@ TESTS = \
        test-lock-session \
        test-switch-to-greeter \
        test-switch-to-greeter-new-session \
+       test-switch-to-greeter-new-session-logout-new \
+       test-switch-to-greeter-new-session-logout-old \
        test-switch-to-greeter-return-session \
+       test-switch-to-greeter-return-session-logout \
        test-switch-to-guest \
        test-switch-to-user \
        test-switch-to-users \
@@ -285,7 +288,10 @@ EXTRA_DIST = \
        scripts/session-stderr-backup.conf \
        scripts/switch-to-greeter.conf \
        scripts/switch-to-greeter-new-session.conf \
+       scripts/switch-to-greeter-new-session-logout-new.conf \
+       scripts/switch-to-greeter-new-session-logout-old.conf \
        scripts/switch-to-greeter-return-session.conf \
+       scripts/switch-to-greeter-return-session-logout.conf \
        scripts/switch-to-guest.conf \
        scripts/switch-to-user.conf \
        scripts/switch-to-users.conf \

diff --git a/tests/scripts/switch-to-greeter-new-session-logout-new.conf b/tests/scripts/switch-to-greeter-new-session-logout-new.conf
new file mode 100644 (file)
index 0000000..43c7602
--- /dev/null
+++ b/tests/scripts/switch-to-greeter-new-session-logout-new.conf
@@ -0,0 +1,77 @@
+#
+# 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
+
+# Session starts
+#?SESSION :50 START USER=have-password1
+#?XSERVER :50 ACCEPT-CONNECT
+#?SESSION :50 CONNECT-XSERVER
+
+# Show the greeter
+#?*SWITCH-TO-GREETER
+#?RUNNER SWITCH-TO-GREETER
+
+# New X server starts
+#?XSERVER :51 START
+#?XSERVER :51 INDICATE-READY
+
+# LightDM connects to X server
+#?XSERVER :51 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
+
+# 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
+
+# New session starts
+#?SESSION :51 START USER=have-password2
+#?XSERVER :51 ACCEPT-CONNECT
+#?SESSION :51 CONNECT-XSERVER
+
+# Logout of new session
+#?*SESSION :51 LOGOUT
+#?XSERVER :51 TERMINATE SIGNAL=15
+
+# X server starts
+#?XSERVER :51 START
+#?XSERVER :51 INDICATE-READY
+#?XSERVER :51 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
+
+# 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)
+#?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
new file mode 100644 (file)
index 0000000..cbe07a0
--- /dev/null
+++ b/tests/scripts/switch-to-greeter-new-session-logout-old.conf
@@ -0,0 +1,81 @@
+#
+# 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
+
+# Session starts
+#?SESSION :50 START USER=have-password1
+#?XSERVER :50 ACCEPT-CONNECT
+#?SESSION :50 CONNECT-XSERVER
+
+# Show the greeter
+#?*SWITCH-TO-GREETER
+#?RUNNER SWITCH-TO-GREETER
+
+# New X server starts
+#?XSERVER :51 START
+#?XSERVER :51 INDICATE-READY
+
+# LightDM connects to X server
+#?XSERVER :51 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
+
+# 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
+
+# New session starts
+#?SESSION :51 START USER=have-password2
+#?XSERVER :51 ACCEPT-CONNECT
+#?SESSION :51 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
+
+# X server starts
+#?XSERVER :50 START
+#?XSERVER :50 INDICATE-READY
+#?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
+
+# 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)
+#?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
new file mode 100644 (file)
index 0000000..8bcabb8
--- /dev/null
+++ b/tests/scripts/switch-to-greeter-return-session-logout.conf
@@ -0,0 +1,75 @@
+#
+# 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
+
+# LightDM connects to X server
+#?XSERVER :50 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION :50 START USER=have-password1
+#?XSERVER :50 ACCEPT-CONNECT
+#?SESSION :50 CONNECT-XSERVER
+
+# Show the greeter
+#?*SWITCH-TO-GREETER
+#?RUNNER SWITCH-TO-GREETER
+
+# New X server starts
+#?XSERVER :51 START
+#?XSERVER :51 INDICATE-READY
+
+# LightDM connects to X server
+#?XSERVER :51 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
+
+# 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 and X server stop
+#?GREETER :51 TERMINATE SIGNAL=15
+#?XSERVER :51 TERMINATE SIGNAL=15
+
+# Logout session
+#?*SESSION :50 LOGOUT
+#?XSERVER :50 TERMINATE SIGNAL=15
+
+# X server starts
+#?XSERVER :50 START
+#?XSERVER :50 INDICATE-READY
+#?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
+
+# 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/test-switch-to-greeter-new-session-logout-new b/tests/test-switch-to-greeter-new-session-logout-new
new file mode 100755 (executable)
index 0000000..52ad0c8
--- /dev/null
+++ b/tests/test-switch-to-greeter-new-session-logout-new
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner switch-to-greeter-new-session-logout-new test-gobject-greeter

diff --git a/tests/test-switch-to-greeter-new-session-logout-old b/tests/test-switch-to-greeter-new-session-logout-old
new file mode 100755 (executable)
index 0000000..1a893ca
--- /dev/null
+++ b/tests/test-switch-to-greeter-new-session-logout-old
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner switch-to-greeter-new-session-logout-old test-gobject-greeter

diff --git a/tests/test-switch-to-greeter-return-session-logout b/tests/test-switch-to-greeter-return-session-logout
new file mode 100755 (executable)
index 0000000..1cbd581
--- /dev/null
+++ b/tests/test-switch-to-greeter-return-session-logout
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner switch-to-greeter-return-session-logout test-gobject-greeter