Add tests to confirm we handle setup scripts missing

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 50a9151016871f6e83f36c9578a0e8ad935df748..327b05c8a4f844832989a737029a2b7f91a488d1 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -111,9 +111,12 @@ TESTS = \
        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 @@ EXTRA_DIST = \
        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 \

diff --git a/tests/scripts/script-hook-fail-display-setup.conf b/tests/scripts/script-hook-display-setup-fail.conf
similarity index 84%
rename from tests/scripts/script-hook-fail-display-setup.conf
rename to tests/scripts/script-hook-display-setup-fail.conf
index c0bde12466544539c1e0908c6d186bdc5fd4f00e..903f82afcd2c3e68be43e6703faaeb0402e89c25 100644 (file)
--- a/tests/scripts/script-hook-fail-display-setup.conf
+++ b/tests/scripts/script-hook-display-setup-fail.conf
@@ -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]

diff --git a/tests/scripts/script-hook-display-setup-missing.conf b/tests/scripts/script-hook-display-setup-missing.conf
new file mode 100644 (file)
index 0000000..06ebd06
--- /dev/null
+++ b/tests/scripts/script-hook-display-setup-missing.conf
@@ -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

diff --git a/tests/scripts/script-hook-fail-greeter-setup.conf b/tests/scripts/script-hook-greeter-setup-fail.conf
similarity index 84%
rename from tests/scripts/script-hook-fail-greeter-setup.conf
rename to tests/scripts/script-hook-greeter-setup-fail.conf
index c1b2bd316cd1de680811466b77e83c733ba46f33..1c377028e7210ef1bdc630a1a54288c1c8d330d3 100644 (file)
--- a/tests/scripts/script-hook-fail-greeter-setup.conf
+++ b/tests/scripts/script-hook-greeter-setup-fail.conf
@@ -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]

diff --git a/tests/scripts/script-hook-greeter-setup-missing.conf b/tests/scripts/script-hook-greeter-setup-missing.conf
new file mode 100644 (file)
index 0000000..939ff35
--- /dev/null
+++ b/tests/scripts/script-hook-greeter-setup-missing.conf
@@ -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

diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-session-setup-fail.conf
similarity index 91%
rename from tests/scripts/script-hook-fail-session-setup.conf
rename to tests/scripts/script-hook-session-setup-fail.conf
index 8bd997408f8efaef2acf0c7d35d0be4a5c408c3c..9e3922f4f21e2e3582e5a2f93d67bb2a33fd91d6 100644 (file)
--- a/tests/scripts/script-hook-fail-session-setup.conf
+++ b/tests/scripts/script-hook-session-setup-fail.conf
@@ -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]

diff --git a/tests/scripts/script-hook-session-setup-missing.conf b/tests/scripts/script-hook-session-setup-missing.conf
new file mode 100644 (file)
index 0000000..c655000
--- /dev/null
+++ b/tests/scripts/script-hook-session-setup-missing.conf
@@ -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

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

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

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

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

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

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

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

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

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