Fix stale X server being left behind when using LockSession D-Bus API

7 files changed, 136 insertions, 30 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1b4bc54e..221ad651 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -109,7 +109,9 @@ TESTS = \
 	test-script-hook-fail-greeter-setup \
 	test-script-hook-fail-session-setup \
 	test-lock-seat \
+	test-lock-seat-return-session \
 	test-lock-session \
+	test-lock-session-return-session \
 	test-switch-to-greeter \
 	test-switch-to-greeter-new-session \
 	test-switch-to-greeter-new-session-logout-new \
@@ -239,7 +241,9 @@ EXTRA_DIST = \
 	scripts/language.conf \
 	scripts/language-no-accounts-service.conf \
 	scripts/lock-seat.conf \
+	scripts/lock-seat-return-session.conf \
 	scripts/lock-session.conf \
+	scripts/lock-session-return-session.conf \
 	scripts/login.conf \
 	scripts/login-crash-authenticate.conf \
 	scripts/login-guest.conf \
diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf
new file mode 100644
index 00000000..ad9a7684
--- /dev/null
+++ b/tests/scripts/lock-seat-return-session.conf
@@ -0,0 +1,61 @@
+#
+# 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
+
+# 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
+
+# Lock the seat
+#?*SESSION :50 LOCK-SEAT
+#?SESSION :50 LOCK-SEAT
+
+# 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
+#?GREETER :51 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 and X server stop
+#?GREETER :51 TERMINATE SIGNAL=15
+#?XSERVER :51 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)
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf
index 85376aa9..fd9fece0 100644
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -5,6 +5,9 @@
 [LightDM]
 minimum-display-number=50
 
+[SeatDefaults]
+autologin-user=have-password1
+
 #?RUNNER DAEMON-START
 
 # X server starts
@@ -14,21 +17,6 @@ minimum-display-number=50
 # 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
-
-# Login
-#?*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
-
 # Session starts
 #?SESSION :50 START USER=have-password1
 #?XSERVER :50 ACCEPT-CONNECT
diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf
new file mode 100644
index 00000000..4580b995
--- /dev/null
+++ b/tests/scripts/lock-session-return-session.conf
@@ -0,0 +1,61 @@
+#
+# 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
+
+# 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
+
+# Lock the session
+#?*SESSION :50 LOCK-SESSION
+#?SESSION :50 LOCK-SESSION
+
+# New X server starts
+#?XSERVER :51 START
+#?XSERVER :51 INDICATE-READY
+
+# LightDM connects to X server
+#?XSERVER :51 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
+
+# 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
+
+# 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)
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf
index 4bc5527b..e95bc1d6 100644
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -5,6 +5,9 @@
 [LightDM]
 minimum-display-number=50
 
+[SeatDefaults]
+autologin-user=have-password1
+
 #?RUNNER DAEMON-START
 
 # X server starts
@@ -14,21 +17,6 @@ minimum-display-number=50
 # 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
-
-# Login
-#?*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
-
 # Session starts
 #?SESSION :50 START USER=have-password1
 #?XSERVER :50 ACCEPT-CONNECT
diff --git a/tests/test-lock-seat-return-session b/tests/test-lock-seat-return-session
new file mode 100755
index 00000000..047e6070
--- /dev/null
+++ b/tests/test-lock-seat-return-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner lock-seat-return-session test-gobject-greeter
diff --git a/tests/test-lock-session-return-session b/tests/test-lock-session-return-session
new file mode 100755
index 00000000..5a8e1495
--- /dev/null
+++ b/tests/test-lock-session-return-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner lock-session-return-session test-gobject-greeter