Add test to check $DESKTOP_SESSION and $GDMSESSION are set.

Approved by Robert Ancell, PS Jenkins bot.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b24f3bca066f6de1530e4641797b7a243c4ef02a..3c50664ffde76e041235448948d6b17904547eda 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,6 +42,7 @@ TESTS = \
        test-autologin-guest-fail-setup-script \
        test-autologin-guest-logout \
        test-group-membership \
+       test-session-env \    
        test-util-path \
        test-session-stdout \
        test-session-stderr \
@@ -346,6 +347,7 @@ EXTRA_DIST = \
        scripts/script-hook-fail-display-setup.conf \
        scripts/script-hook-fail-greeter-setup.conf \
        scripts/script-hook-fail-session-setup.conf \
+       scripts/session-env.conf \
        scripts/session-stdout.conf \
        scripts/session-stderr.conf \
        scripts/session-stderr-multi-write.conf \

diff --git a/tests/scripts/session-env.conf b/tests/scripts/session-env.conf
new file mode 100644 (file)
index 0000000..8a96b80
--- /dev/null
+++ b/tests/scripts/session-env.conf
@@ -0,0 +1,33 @@
+#
+# Check logind variables are set in session
+#
+
+[SeatDefaults]
+autologin-user=have-password1
+user-session=default
+
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7
+#?XSERVER-0 INDICATE-READY
+
+# LightDM connects to X server
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Check environment variables
+#?*SESSION-X-0 READ-ENV NAME=DESKTOP_SESSION
+#?SESSION-X-0 READ-ENV NAME=DESKTOP_SESSION VALUE=default
+#?*SESSION-X-0 READ-ENV NAME=GDMSESSION
+#?SESSION-X-0 READ-ENV NAME=GDMSESSION VALUE=default
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

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