Test session-setup script failing

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c8b6d739d03f683a75ea5386c61b78b690af81cb..ddd03682db1599bec6db1ff030f3d7a6cf2ec6f6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,6 +36,7 @@ TESTS = \
        test-script-hooks \
        test-script-hook-fail-display-setup \
        test-script-hook-fail-greeter-setup \
+       test-script-hook-fail-session-setup \
        test-switch-to-greeter \
        test-switch-to-guest \
        test-switch-to-user \
@@ -101,6 +102,7 @@ EXTRA_DIST = \
        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/switch-to-greeter.conf \
        scripts/switch-to-guest.conf \
        scripts/switch-to-user.conf \

diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf
new file mode 100644 (file)
index 0000000..f9a5a6a
--- /dev/null
+++ b/tests/scripts/script-hook-fail-session-setup.conf
@@ -0,0 +1,33 @@
+#
+# Check LightDM stops returns to the greeter if the session setup script fails
+#
+
+[SeatDefaults]
+session-setup-script=test-script-hook SESSION-SETUP 1
+autologin-user=alice
+
+#?RUNNER DAEMON-START
+
+# One X server should start by default
+#?XSERVER :50 START
+#?XSERVER :50 INDICATE-READY
+
+# LightDM connects to X server
+#?XSERVER :50 ACCEPT-CONNECT
+
+# Setup script fails
+#?SCRIPT-HOOK SESSION-SETUP
+
+# Greeter starts
+#?GREETER START
+#?XSERVER :50 ACCEPT-CONNECT
+#?GREETER CONNECT-XSERVER :50
+#?GREETER CONNECT-TO-DAEMON
+#?GREETER CONNECTED-TO-DAEMON
+
+# Cleanup
+#?*STOP-DAEMON
+# Don't know what order they will terminate
+#?(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/test-script-hook-fail-session-setup b/tests/test-script-hook-fail-session-setup
new file mode 100755 (executable)
index 0000000..cc3ff85
--- /dev/null
+++ b/tests/test-script-hook-fail-session-setup
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/test-runner script-hook-fail-session-setup test-gobject-greeter