summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2012-04-04 17:32:17 +1000
committerRobert Ancell <robert.ancell@canonical.com>2012-04-04 17:32:17 +1000
commit7b617015d751c29e06f6989fcd770e6bbd132a97 (patch)
tree402af57cbc90d681acf110343832770e0dba999e /tests
parent07745120b4c31ec14252c06b300148e2083fac99 (diff)
downloadlightdm-7b617015d751c29e06f6989fcd770e6bbd132a97.tar.gz
Add test for utility path
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/scripts/util-path.conf35
-rwxr-xr-xtests/test-util-path2
3 files changed, 39 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 301edf06..d7011ef9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,6 +27,7 @@ TESTS = \
test-autologin-guest-fail-setup-script \
test-autologin-guest-logout \
test-group-membership \
+ test-util-path \
test-session-stdout \
test-session-stderr \
test-session-stderr-multi-write \
@@ -105,6 +106,7 @@ TESTS = \
test-switch-to-user-existing-session \
test-switch-to-user-no-password \
test-switch-to-user-logout \
+ scripts/util-path.conf \
test-vnc-login \
test-xdmcp-login \
test-no-accounts-service \
diff --git a/tests/scripts/util-path.conf b/tests/scripts/util-path.conf
new file mode 100644
index 00000000..185ff981
--- /dev/null
+++ b/tests/scripts/util-path.conf
@@ -0,0 +1,35 @@
+#
+# Check utility path is set in session
+#
+
+[LightDM]
+minimum-display-number=50
+
+[SeatDefaults]
+autologin-user=have-password1
+
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER :50 START
+#?XSERVER :50 INDICATE-READY
+
+# LightDM connects to X server
+#?XSERVER :50 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION :50 START USER=have-password1
+#?XSERVER :50 ACCEPT-CONNECT
+#?SESSION :50 CONNECT-XSERVER
+
+# Check utility path is there
+#?*SESSION :50 READ-ENV NAME=PATH
+# FIXME: This is a really crap regex and the path could be overridden in the configure stage
+#?SESSION :50 READ-ENV NAME=PATH VALUE=.*/lightdm:.*
+
+# Cleanup
+#?*STOP-DAEMON
+# Don't know what order they will terminate
+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/test-util-path b/tests/test-util-path
new file mode 100755
index 00000000..05c7cd5d
--- /dev/null
+++ b/tests/test-util-path
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner util-path test-gobject-greeter