Merge with trunk

10 files changed, 142 insertions, 0 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5f9e4bb4..d97016a3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -182,8 +182,11 @@ TESTS = \
 	test-xdmcp-server-open-file-descriptors \
 	test-multi-seat \
 	test-multi-seat-seat0-non-graphical \
+	test-multi-seat-seat0-non-graphical-disabled \
 	test-multi-seat-non-graphical \
+	test-multi-seat-non-graphical-disabled \
 	test-multi-seat-change-graphical \
+	test-multi-seat-change-graphical-disabled \
 	test-mir-autologin \
 	test-mir-greeter \
 	test-mir-session \
@@ -452,8 +455,11 @@ EXTRA_DIST = \
 	scripts/mir-session-crash.conf \
 	scripts/multi-seat.conf \
 	scripts/multi-seat-change-graphical.conf \
+	scripts/multi-seat-change-graphical-disabled.conf \
 	scripts/multi-seat-non-graphical.conf \
+	scripts/multi-seat-non-graphical-disabled.conf \
 	scripts/multi-seat-seat0-non-graphical.conf \
+	scripts/multi-seat-seat0-non-graphical-disabled.conf \
 	scripts/no-accounts-service.conf \
 	scripts/no-config.conf \
 	scripts/no-console-kit.conf \
diff --git a/tests/scripts/multi-seat-change-graphical-disabled.conf b/tests/scripts/multi-seat-change-graphical-disabled.conf
new file mode 100644
index 00000000..2fdd9fc5
--- /dev/null
+++ b/tests/scripts/multi-seat-change-graphical-disabled.conf
@@ -0,0 +1,53 @@
+#
+# Check seat graphical status is ignored
+#
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# seat0 starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Add seat1
+#?*ADD-SEAT ID=seat1
+
+# seat1 starts
+#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 START XDG_SEAT=seat1 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+
+# Remove graphical status from seat
+#?*UPDATE-SEAT ID=seat1 CAN-GRAPHICAL=FALSE
+
+# Nothing happens
+#?*WAIT
+
+# Add graphical status back
+#?*UPDATE-SEAT ID=seat1 CAN-GRAPHICAL=TRUE
+
+# Nothing happens
+#?*WAIT
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/multi-seat-change-graphical.conf b/tests/scripts/multi-seat-change-graphical.conf
index 4b7841d2..b818d479 100644
--- a/tests/scripts/multi-seat-change-graphical.conf
+++ b/tests/scripts/multi-seat-change-graphical.conf
@@ -2,6 +2,9 @@
 # Check seat can change graphical status
 #
 
+[LightDM]
+logind-check-graphical=true
+
 #?*START-DAEMON
 #?RUNNER DAEMON-START
 
diff --git a/tests/scripts/multi-seat-non-graphical-disabled.conf b/tests/scripts/multi-seat-non-graphical-disabled.conf
new file mode 100644
index 00000000..2dea15f7
--- /dev/null
+++ b/tests/scripts/multi-seat-non-graphical-disabled.conf
@@ -0,0 +1,41 @@
+#
+# Check non graphical seats are started anyway
+#
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# seat0 starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Add seat1
+#?*ADD-SEAT ID=seat1 CAN-GRAPHICAL=FALSE
+
+# seat1 starts
+#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 START XDG_SEAT=seat1 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/multi-seat-non-graphical.conf b/tests/scripts/multi-seat-non-graphical.conf
index b07533d1..45f045b9 100644
--- a/tests/scripts/multi-seat-non-graphical.conf
+++ b/tests/scripts/multi-seat-non-graphical.conf
@@ -2,6 +2,9 @@
 # Check non graphical seats are ignored
 #
 
+[LightDM]
+logind-check-graphical=true
+
 #?*START-DAEMON
 #?RUNNER DAEMON-START
 
diff --git a/tests/scripts/multi-seat-seat0-non-graphical-disabled.conf b/tests/scripts/multi-seat-seat0-non-graphical-disabled.conf
new file mode 100644
index 00000000..ddac6154
--- /dev/null
+++ b/tests/scripts/multi-seat-seat0-non-graphical-disabled.conf
@@ -0,0 +1,27 @@
+#
+# Check seat0 is started even if it is marked as non-graphical
+#
+
+[test-runner-config]
+seat0-can-graphical=false
+
+#?*START-DAEMON
+#?RUNNER DAEMON-START
+
+# seat0 starts
+#?XSERVER-0 START VT=7 SEAT=seat0
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/multi-seat-seat0-non-graphical.conf b/tests/scripts/multi-seat-seat0-non-graphical.conf
index b3925956..f6c4233d 100644
--- a/tests/scripts/multi-seat-seat0-non-graphical.conf
+++ b/tests/scripts/multi-seat-seat0-non-graphical.conf
@@ -2,6 +2,9 @@
 # Check seat0 is started only once it becomes graphical
 #
 
+[LightDM]
+logind-check-graphical=true
+
 [test-runner-config]
 seat0-can-graphical=false
 
diff --git a/tests/test-multi-seat-change-graphical-disabled b/tests/test-multi-seat-change-graphical-disabled
new file mode 100755
index 00000000..296b7f04
--- /dev/null
+++ b/tests/test-multi-seat-change-graphical-disabled
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner multi-seat-change-graphical-disabled test-gobject-greeter
diff --git a/tests/test-multi-seat-non-graphical-disabled b/tests/test-multi-seat-non-graphical-disabled
new file mode 100755
index 00000000..43c8050e
--- /dev/null
+++ b/tests/test-multi-seat-non-graphical-disabled
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner multi-seat-non-graphical-disabled test-gobject-greeter
diff --git a/tests/test-multi-seat-seat0-non-graphical-disabled b/tests/test-multi-seat-seat0-non-graphical-disabled
new file mode 100755
index 00000000..071b09ca
--- /dev/null
+++ b/tests/test-multi-seat-seat0-non-graphical-disabled
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner multi-seat-seat0-non-graphical-disabled test-gobject-greeter