Add tests for Xauthority file location

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0776e148ea3515476789cbdc34f0062aa2d62139..932aaa626f6e7a48a017527ddec4c4a4f4524cc9 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,8 @@ TESTS = \
        test-autologin-guest-logout \
        test-session-stdout \
        test-session-stderr \
+       test-xauthority \
+       test-system-xauthority \
        test-user-renamed \
        test-user-renamed-invalid \
        test-keyboard-layout \
@@ -194,8 +196,10 @@ EXTRA_DIST = \
        scripts/switch-to-user-existing-session.conf \
        scripts/switch-to-user-logout.conf \
        scripts/switch-to-user-no-password.conf \
+       scripts/system-xauthority.conf \
        scripts/user-renamed.conf \
        scripts/user-renamed-invalid.conf \
        scripts/vnc-login.conf \
+       scripts/xauthority.conf \
        scripts/xdmcp-login.conf \
        scripts/xserver-fail-start.conf

diff --git a/tests/scripts/system-xauthority.conf b/tests/scripts/system-xauthority.conf
new file mode 100644 (file)
index 0000000..17f4de5
--- /dev/null
+++ b/tests/scripts/system-xauthority.conf
@@ -0,0 +1,35 @@
+#
+# Check X authority written into system directory
+#
+
+[LightDM]
+minimum-display-number=50
+user-authority-in-system-dir=true
+
+[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 where the X authority is
+#?*SESSION :50 READ-ENV NAME=XAUTHORITY
+#?SESSION :50 READ-ENV NAME=XAUTHORITY VALUE=.*/var/run/lightdm/have-password1/xauthority
+
+# 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/scripts/xauthority.conf b/tests/scripts/xauthority.conf
new file mode 100644 (file)
index 0000000..f07890b
--- /dev/null
+++ b/tests/scripts/xauthority.conf
@@ -0,0 +1,34 @@
+#
+# Check X authority written into home directory
+#
+
+[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 where the X authority is
+#?*SESSION :50 READ-ENV NAME=XAUTHORITY
+#?SESSION :50 READ-ENV NAME=XAUTHORITY VALUE=.*/home/have-password1/.Xauthority
+
+# 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-system-xauthority b/tests/test-system-xauthority
new file mode 100755 (executable)
index 0000000..d6bef72
--- /dev/null
+++ b/tests/test-system-xauthority
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner system-xauthority test-gobject-greeter

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