Add more Mir tests for Unity seat type

10 files changed, 146 insertions, 4 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8153fa7a..887ddfe9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -145,7 +145,10 @@ TESTS = \
 	test-unity-login \
 	test-unity-switch \
 	test-unity-plymouth \
-	test-unity-mir-login
+	test-unity-mir-autologin \
+	test-unity-mir-greeter-x-session \
+	test-unity-mir-greeter-mir-session \
+	test-unity-mir-session-x-greeter
 
 #	test-session-exit-error
 #	test-greeter-no-exit
@@ -399,7 +402,10 @@ EXTRA_DIST = \
 	scripts/unity-compositor-fail-ready.conf \
 	scripts/unity-compositor-fail-start.conf \
 	scripts/unity-login.conf \
-	scripts/unity-mir-login.conf \
+	scripts/unity-mir-autologin.conf \
+	scripts/unity-mir-greeter-mir-session.conf \
+	scripts/unity-mir-greeter-x-session.conf \
+	scripts/unity-mir-session-x-greet.confer
 	scripts/unity-plymouth.conf \
 	scripts/unity-switch.conf \
 	scripts/users.conf \
diff --git a/tests/scripts/unity-mir-autologin.conf b/tests/scripts/unity-mir-autologin.conf
new file mode 100644
index 00000000..f40d18ae
--- /dev/null
+++ b/tests/scripts/unity-mir-autologin.conf
@@ -0,0 +1,26 @@
+#
+# Check can run automatically log into a Mir session
+#
+
+[SeatDefaults]
+type=unity
+autologin-user=have-password1
+user-session=mir
+
+#?RUNNER DAEMON-START
+
+# System compositor starts
+#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?*UNITY-SYSTEM-COMPOSITOR READY
+
+# Session starts
+#?SESSION-MIR-0 START USER=have-password1
+
+# System compositor switches to session
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-MIR-0 TERMINATE SIGNAL=15
+#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/unity-mir-login.conf b/tests/scripts/unity-mir-greeter-mir-session.conf
index c5fa6ed0..c5fa6ed0 100644
--- a/tests/scripts/unity-mir-login.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf
new file mode 100644
index 00000000..01dd98de
--- /dev/null
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -0,0 +1,52 @@
+#
+# Check can log into an X session from a Mir greeter
+#
+
+[SeatDefaults]
+type=unity
+user-session=default
+
+#?RUNNER DAEMON-START
+
+# System compositor starts
+#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?*UNITY-SYSTEM-COMPOSITOR READY
+
+# Greeter starts
+#?GREETER-MIR-0 START
+#?GREETER-MIR-0 CONNECT-TO-DAEMON
+#?GREETER-MIR-0 CONNECTED-TO-DAEMON
+
+# System compositor switches to greeter
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+
+# Log into account with a password
+#?*GREETER-MIR-0 AUTHENTICATE USERNAME=no-password1
+#?GREETER-MIR-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
+#?*GREETER-MIR-0 START-SESSION
+
+# X server starts
+#?XSERVER-0 START MIR-ID=1
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START USER=no-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# System compositor switches to session
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+
+# Greeter stops
+#?GREETER-MIR-0 TERMINATE SIGNAL=15
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf
new file mode 100644
index 00000000..8f913b76
--- /dev/null
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -0,0 +1,52 @@
+#
+# Check can log into a Mir session from an X greeter
+#
+
+[SeatDefaults]
+type=unity
+user-session=mir
+
+#?RUNNER DAEMON-START
+
+# System compositor starts
+#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?*UNITY-SYSTEM-COMPOSITOR READY
+
+# X server starts
+#?XSERVER-0 START MIR-ID=0
+
+# 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
+
+# System compositor switches to greeter
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+
+# 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-1 START USER=no-password1
+
+# System compositor switches to session
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+
+# Greeter quits once session ready
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-MIR-1 TERMINATE SIGNAL=15
+#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/test-unity-mir-autologin b/tests/test-unity-mir-autologin
new file mode 100755
index 00000000..e87c68e6
--- /dev/null
+++ b/tests/test-unity-mir-autologin
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner unity-mir-autologin test-mir-greeter
diff --git a/tests/test-unity-mir-greeter-mir-session b/tests/test-unity-mir-greeter-mir-session
new file mode 100755
index 00000000..746d89cd
--- /dev/null
+++ b/tests/test-unity-mir-greeter-mir-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner unity-mir-greeter-mir-session test-mir-greeter
diff --git a/tests/test-unity-mir-greeter-x-session b/tests/test-unity-mir-greeter-x-session
new file mode 100755
index 00000000..56160d00
--- /dev/null
+++ b/tests/test-unity-mir-greeter-x-session
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner unity-mir-greeter-x-session test-mir-greeter
diff --git a/tests/test-unity-mir-login b/tests/test-unity-mir-login
deleted file mode 100755
index 1f8c2c3a..00000000
--- a/tests/test-unity-mir-login
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-./src/dbus-env ./src/test-runner unity-mir-login test-mir-greeter
diff --git a/tests/test-unity-mir-session-x-greeter b/tests/test-unity-mir-session-x-greeter
new file mode 100755
index 00000000..8ff0b78e
--- /dev/null
+++ b/tests/test-unity-mir-session-x-greeter
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner unity-mir-session-x-greeter test-gobject-greeter