Merge lp:~robert-ancell/lightdm/test-missing-setup-scripts into lp:lightdm

[Robert Ancell]

Add tests to confirm we handle setup scripts missing

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2014-03-12 06:10:17 +0000
+++ tests/Makefile.am	2014-03-14 02:46:27 +0000
@@ -111,9 +111,12 @@
 	test-plymouth-inactive-vt \
 	test-plymouth-no-seat \
 	test-script-hooks \
-	test-script-hook-fail-display-setup \
-	test-script-hook-fail-greeter-setup \
-	test-script-hook-fail-session-setup \
+	test-script-hook-display-setup-fail \
+	test-script-hook-display-setup-missing \
+	test-script-hook-greeter-setup-fail \
+	test-script-hook-greeter-setup-missing \
+	test-script-hook-session-setup-fail \
+	test-script-hook-session-setup-missing \
 	test-shared-data-greeter-to-session \
 	test-shared-data-session-to-greeter \
 	test-shared-data-session-to-greeter-autologin \
@@ -435,9 +438,12 @@
 	scripts/shared-data-session-to-greeter.conf \
 	scripts/shared-data-session-to-greeter-autologin.conf \
 	scripts/script-hooks.conf \
-	scripts/script-hook-fail-display-setup.conf \
-	scripts/script-hook-fail-greeter-setup.conf \
-	scripts/script-hook-fail-session-setup.conf \
+	scripts/script-hook-display-setup-fail.conf \
+	scripts/script-hook-display-setup-missing.conf \
+	scripts/script-hook-greeter-setup-fail.conf \
+	scripts/script-hook-greeter-setup-missing.conf \
+	scripts/script-hook-session-setup-fail.conf \
+	scripts/script-hook-session-setup-missing.conf \
 	scripts/session-stdout.conf \
 	scripts/session-stderr.conf \
 	scripts/session-stderr-multi-write.conf \

=== renamed file 'tests/scripts/script-hook-fail-display-setup.conf' => 'tests/scripts/script-hook-display-setup-fail.conf'
--- tests/scripts/script-hook-fail-display-setup.conf	2014-02-25 04:01:50 +0000
+++ tests/scripts/script-hook-display-setup-fail.conf	2014-03-14 02:46:27 +0000
@@ -1,5 +1,5 @@
 #
-# Check LightDM stops the display if the display setup script returns an error
+# Check LightDM stops if the display setup script returns an error
 #
 
 [SeatDefaults]

=== added file 'tests/scripts/script-hook-display-setup-missing.conf'
--- tests/scripts/script-hook-display-setup-missing.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/script-hook-display-setup-missing.conf	2014-03-14 02:46:27 +0000
@@ -0,0 +1,24 @@
+#
+# Check LightDM stops if the display setup script is missing
+#
+
+[SeatDefaults]
+display-setup-script=test-script-hook-INVALID
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# One X server should start by default
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Setup script fails
+
+#?XSERVER-0 TERMINATE SIGNAL=15
+
+# Cleanup
+#?RUNNER DAEMON-EXIT STATUS=1

=== renamed file 'tests/scripts/script-hook-fail-greeter-setup.conf' => 'tests/scripts/script-hook-greeter-setup-fail.conf'
--- tests/scripts/script-hook-fail-greeter-setup.conf	2014-02-25 04:01:50 +0000
+++ tests/scripts/script-hook-greeter-setup-fail.conf	2014-03-14 02:46:27 +0000
@@ -1,5 +1,5 @@
 #
-# Check LightDM stops the display if the display setup script returns an error
+# Check LightDM stops if the greeter setup script returns an error
 #
 
 [SeatDefaults]

=== added file 'tests/scripts/script-hook-greeter-setup-missing.conf'
--- tests/scripts/script-hook-greeter-setup-missing.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/script-hook-greeter-setup-missing.conf	2014-03-14 02:46:27 +0000
@@ -0,0 +1,24 @@
+#
+# Check LightDM stops if the greeter setup script is missing
+#
+
+[SeatDefaults]
+greeter-setup-script=test-script-hook-INVALID
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# One X server should start by default
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Setup script fails
+
+#?XSERVER-0 TERMINATE SIGNAL=15
+
+# Cleanup
+#?RUNNER DAEMON-EXIT STATUS=1

=== renamed file 'tests/scripts/script-hook-fail-session-setup.conf' => 'tests/scripts/script-hook-session-setup-fail.conf'
--- tests/scripts/script-hook-fail-session-setup.conf	2014-02-25 04:01:50 +0000
+++ tests/scripts/script-hook-session-setup-fail.conf	2014-03-14 02:46:27 +0000
@@ -1,5 +1,5 @@
 #
-# Check LightDM stops returns to the greeter if the session setup script fails
+# Check LightDM returns to the greeter if the session setup script fails
 #
 
 [SeatDefaults]

=== added file 'tests/scripts/script-hook-session-setup-missing.conf'
--- tests/scripts/script-hook-session-setup-missing.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/script-hook-session-setup-missing.conf	2014-03-14 02:46:27 +0000
@@ -0,0 +1,35 @@
+#
+# Check LightDM returns to the greeter if the session setup script is missing
+#
+
+[SeatDefaults]
+session-setup-script=test-script-hook-INVALID
+autologin-user=have-password1
+user-session=default
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# One X server should start by default
+#?XSERVER-0 START VT=7 SEAT=seat0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Setup script fails
+
+# Greeter starts
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+#?GREETER-X-0 SELECT-USER-HINT USERNAME=have-password1
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

=== renamed file 'tests/test-script-hook-fail-display-setup' => 'tests/test-script-hook-display-setup-fail'
--- tests/test-script-hook-fail-display-setup	2012-01-13 13:05:33 +0000
+++ tests/test-script-hook-display-setup-fail	2014-03-14 02:46:27 +0000
@@ -1,2 +1,2 @@
 #!/bin/sh
-./src/dbus-env ./src/test-runner script-hook-fail-display-setup test-gobject-greeter
+./src/dbus-env ./src/test-runner script-hook-display-setup-fail test-gobject-greeter

=== added file 'tests/test-script-hook-display-setup-missing'
--- tests/test-script-hook-display-setup-missing	1970-01-01 00:00:00 +0000
+++ tests/test-script-hook-display-setup-missing	2014-03-14 02:46:27 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner script-hook-display-setup-missing test-gobject-greeter

=== renamed file 'tests/test-script-hook-fail-greeter-setup' => 'tests/test-script-hook-greeter-setup-fail'
--- tests/test-script-hook-fail-greeter-setup	2012-01-13 13:05:33 +0000
+++ tests/test-script-hook-greeter-setup-fail	2014-03-14 02:46:27 +0000
@@ -1,2 +1,2 @@
 #!/bin/sh
-./src/dbus-env ./src/test-runner script-hook-fail-greeter-setup test-gobject-greeter
+./src/dbus-env ./src/test-runner script-hook-greeter-setup-fail test-gobject-greeter

=== added file 'tests/test-script-hook-greeter-setup-missing'
--- tests/test-script-hook-greeter-setup-missing	1970-01-01 00:00:00 +0000
+++ tests/test-script-hook-greeter-setup-missing	2014-03-14 02:46:27 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner script-hook-greeter-setup-missing test-gobject-greeter

=== renamed file 'tests/test-script-hook-fail-session-setup' => 'tests/test-script-hook-session-setup-fail'
--- tests/test-script-hook-fail-session-setup	2012-01-13 13:05:33 +0000
+++ tests/test-script-hook-session-setup-fail	2014-03-14 02:46:27 +0000
@@ -1,2 +1,2 @@
 #!/bin/sh
-./src/dbus-env ./src/test-runner script-hook-fail-session-setup test-gobject-greeter
+./src/dbus-env ./src/test-runner script-hook-session-setup-fail test-gobject-greeter

=== added file 'tests/test-script-hook-session-setup-missing'
--- tests/test-script-hook-session-setup-missing	1970-01-01 00:00:00 +0000
+++ tests/test-script-hook-session-setup-missing	2014-03-14 02:46:27 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner script-hook-session-setup-missing test-gobject-greeter