Add autologin test and fix other tests

6 files changed, 54 insertions, 3 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 86646bdf..d99355fe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -134,6 +134,7 @@ TESTS = \
 	test-gobject-power-no-services \
 	test-open-file-descriptors \
 	test-xdmcp-server-open-file-descriptors \
+	test-mir-autologin \
 	test-mir-greeter-x-session \
 	test-mir-greeter-mir-session \
 	test-mir-session-x-greeter \
@@ -349,6 +350,7 @@ EXTRA_DIST = \
 	scripts/login-two-factor.conf \
 	scripts/login-wrong-password.conf \
 	scripts/login-xserver-crash.conf \
+	scripts/mir-autologin.conf \
 	scripts/mir-greeter-x-session.conf \
 	scripts/mir-greeter-mir-session.conf \
 	scripts/mir-session-x-greeter.conf \
diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf
new file mode 100644
index 00000000..f2a122c3
--- /dev/null
+++ b/tests/scripts/mir-autologin.conf
@@ -0,0 +1,17 @@
+#
+# Check can run automatically log into a Mir session
+#
+
+[SeatDefaults]
+autologin-user=have-password1
+user-session=mir
+
+#?RUNNER DAEMON-START
+
+# Session starts
+#?SESSION-MIR START VT=7 USER=have-password1
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-MIR 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
new file mode 100644
index 00000000..2d7a9bd4
--- /dev/null
+++ b/tests/scripts/mir-greeter-mir-session.conf
@@ -0,0 +1,30 @@
+#
+# 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
+#?XSERVER-0 ACCEPT-CONNECT
+#?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=have-password1
+
+# 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
index f7de0610..457d50bc 100644
--- a/tests/scripts/mir-greeter-x-session.conf
+++ b/tests/scripts/mir-greeter-x-session.conf
@@ -16,7 +16,7 @@ user-session=default
 # Log into account
 #?*GREETER-MIR AUTHENTICATE USERNAME=no-password1
 #?GREETER-MIR AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
-#?*GREETER-MIR START-SESSION SESSION=mir
+#?*GREETER-MIR START-SESSION
 #?GREETER-MIR TERMINATE SIGNAL=15
 
 # X server starts for session
diff --git a/tests/scripts/mir-session-x-greeter.conf b/tests/scripts/mir-session-x-greeter.conf
index ccda9b4b..c59cd48c 100644
--- a/tests/scripts/mir-session-x-greeter.conf
+++ b/tests/scripts/mir-session-x-greeter.conf
@@ -3,7 +3,7 @@
 #
 
 [SeatDefaults]
-user-session=default
+user-session=mir
 
 #?RUNNER DAEMON-START
 
@@ -25,7 +25,7 @@ user-session=default
 # 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=mir
+#?*GREETER-X-0 START-SESSION
 
 # Session starts
 #?SESSION-MIR START VT=8 USER=have-password1
diff --git a/tests/test-mir-autologin b/tests/test-mir-autologin
new file mode 100755
index 00000000..1a1e016f
--- /dev/null
+++ b/tests/test-mir-autologin
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner mir-autologin test-mir-greeter