Test that trying to start a Mir session from a VT seat does the right thing

5 files changed, 34 insertions, 93 deletions

diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf
index f2a122c3..b055b56f 100644
--- a/tests/scripts/mir-autologin.conf
+++ b/tests/scripts/mir-autologin.conf
@@ -1,5 +1,5 @@
 #
-# Check can run automatically log into a Mir session
+# Check can't automatically log into a Mir session from a VT based seat
 #
 
 [SeatDefaults]
@@ -8,10 +8,25 @@ user-session=mir
 
 #?RUNNER DAEMON-START
 
-# Session starts
-#?SESSION-MIR START VT=7 USER=have-password1
+# (session fails to start)
+
+# X server starts
+#?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-MIR TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/mir-greeter-mir-session.conf b/tests/scripts/mir-greeter-mir-session.conf
deleted file mode 100644
index 9d03c2a8..00000000
--- a/tests/scripts/mir-greeter-mir-session.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Check can run a Mir greeter and log into a Mir session
-#
-
-[SeatDefaults]
-user-session=mir
-
-#?RUNNER DAEMON-START
-
-# Greeter starts
-#?GREETER-MIR START VT=7
-#?GREETER-MIR CONNECT-TO-DAEMON
-#?GREETER-MIR CONNECTED-TO-DAEMON
-
-# Log into account
-#?*GREETER-MIR AUTHENTICATE USERNAME=no-password1
-#?GREETER-MIR AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-MIR START-SESSION
-
-# Session starts
-#?SESSION-MIR START VT=8 USER=no-password1
-
-# Switch to session
-#?VT ACTIVATE VT=8
-
-# Greeter quits once session ready
-#?GREETER-MIR TERMINATE SIGNAL=15
-
-# Cleanup
-#?*STOP-DAEMON
-#?SESSION-MIR TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/mir-greeter-x-session.conf b/tests/scripts/mir-greeter-x-session.conf
deleted file mode 100644
index fd809db9..00000000
--- a/tests/scripts/mir-greeter-x-session.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Check can run a Mir greeter and log into an X session
-#
-
-[SeatDefaults]
-user-session=default
-
-#?RUNNER DAEMON-START
-
-# Greeter starts
-#?GREETER-MIR START VT=7
-#?GREETER-MIR CONNECT-TO-DAEMON
-#?GREETER-MIR CONNECTED-TO-DAEMON
-
-# Log into account
-#?*GREETER-MIR AUTHENTICATE USERNAME=no-password1
-#?GREETER-MIR AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-MIR START-SESSION
-
-# X server starts for session
-#?XSERVER-0 START VT=8
-
-# Daemon connects when X server is ready
-#?*XSERVER-0 INDICATE-READY
-#?XSERVER-0 INDICATE-READY
-#?XSERVER-0 ACCEPT-CONNECT
-
-# Switch to session
-#?VT ACTIVATE VT=8
-
-# Greeter terminates
-#?GREETER-MIR TERMINATE SIGNAL=15
-
-# Session starts
-#?SESSION-X-0 START USER=no-password1
-#?XSERVER-0 ACCEPT-CONNECT
-#?SESSION-X-0 CONNECT-XSERVER
-
-# Cleanup
-#?*STOP-DAEMON
-#?SESSION-X-0 TERMINATE SIGNAL=15
-#?XSERVER-0 TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/mir-greeter.conf b/tests/scripts/mir-greeter.conf
new file mode 100644
index 00000000..6e78d3b7
--- /dev/null
+++ b/tests/scripts/mir-greeter.conf
@@ -0,0 +1,10 @@
+#
+# Check can't run a Mir greeter from a VT based seat
+#
+
+#?RUNNER DAEMON-START
+
+# (greeter fails to start)
+
+# Daemon stops with error
+#?RUNNER DAEMON-EXIT STATUS=1
diff --git a/tests/scripts/mir-session-x-greeter.conf b/tests/scripts/mir-session.conf
index fa1ed4e8..6121b8e0 100644
--- a/tests/scripts/mir-session-x-greeter.conf
+++ b/tests/scripts/mir-session.conf
@@ -1,5 +1,5 @@
 #
-# Check can login to a Mir session from an X greeter
+# Check can't login into a Mir session on a VT based seat
 #
 
 [SeatDefaults]
@@ -22,22 +22,13 @@ user-session=mir
 #?GREETER-X-0 CONNECT-TO-DAEMON
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
-# Log into account
+# Attempt to log into account
 #?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1
 #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-0 START-SESSION
-
-# Session starts
-#?SESSION-MIR START VT=8 USER=no-password1
-
-# Switch to session
-#?VT ACTIVATE VT=8
-
-# Greeter quits once session ready
-#?GREETER-X-0 TERMINATE SIGNAL=15
-#?XSERVER-0 TERMINATE SIGNAL=15
+#?*GREETER-X-0 SESSION-FAILED
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-MIR TERMINATE SIGNAL=15
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0