From ac9230a0a83ea74b65af46232ab4f3bba458fb13 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 2 Aug 2016 21:31:12 +1200 Subject: [PATCH] Add a test for multi-seat autologin --- tests/Makefile.am | 6 ++- tests/scripts/multi-seat-autologin-seat0.conf | 42 +++++++++++++++++++ tests/scripts/multi-seat-autologin-seat1.conf | 42 +++++++++++++++++++ tests/test-multi-seat-autologin-seat0 | 2 + tests/test-multi-seat-autologin-seat1 | 2 + 5 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 tests/scripts/multi-seat-autologin-seat0.conf create mode 100644 tests/scripts/multi-seat-autologin-seat1.conf create mode 100755 tests/test-multi-seat-autologin-seat0 create mode 100755 tests/test-multi-seat-autologin-seat1 diff --git a/tests/Makefile.am b/tests/Makefile.am index c64e9a86..24f102c8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -218,7 +218,9 @@ TESTS = \ test-xdmcp-server-open-file-descriptors \ test-add-local-x-seat \ test-multi-seat \ - test-multi-seat-login \ + test-multi-seat-login \ + test-multi-seat-autologin-seat0 \ + test-multi-seat-autologin-seat1 \ test-multi-seat-seat0-non-graphical \ test-multi-seat-seat0-non-graphical-disabled \ test-multi-seat-non-graphical \ @@ -514,6 +516,8 @@ EXTRA_DIST = \ scripts/mir-session-crash.conf \ scripts/multiple-authenticate.conf \ scripts/multi-seat.conf \ + scripts/multi-seat-autologin-seat0.conf \ + scripts/multi-seat-autologin-seat1.conf \ scripts/multi-seat-change-graphical.conf \ scripts/multi-seat-change-graphical-disabled.conf \ scripts/multi-seat-login.conf \ diff --git a/tests/scripts/multi-seat-autologin-seat0.conf b/tests/scripts/multi-seat-autologin-seat0.conf new file mode 100644 index 00000000..d16a26af --- /dev/null +++ b/tests/scripts/multi-seat-autologin-seat0.conf @@ -0,0 +1,42 @@ +# +# Check autologin works on one seat only +# + +[Seat:seat0] +autologin-user=have-password1 + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# seat0 starts with autologin +#?XSERVER-0 START VT=7 SEAT=seat0 +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c0 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# Add seat1 +#?*ADD-SEAT ID=seat1 + +# seat1 starts with greeter +#?XSERVER-1 START SEAT=seat1 +#?*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 +#?SESSION-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-autologin-seat1.conf b/tests/scripts/multi-seat-autologin-seat1.conf new file mode 100644 index 00000000..7ef29afe --- /dev/null +++ b/tests/scripts/multi-seat-autologin-seat1.conf @@ -0,0 +1,42 @@ +# +# Check autologin works on one seat only +# + +[Seat:seat1] +autologin-user=have-password1 + +#?*START-DAEMON +#?RUNNER DAEMON-START + +# seat0 starts with greeter +#?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 with autologin +#?XSERVER-1 START SEAT=seat1 +#?*XSERVER-1 INDICATE-READY +#?XSERVER-1 INDICATE-READY +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 START XDG_SEAT=seat1 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1 +#?LOGIN1 ACTIVATE-SESSION SESSION=c1 +#?XSERVER-1 ACCEPT-CONNECT +#?SESSION-X-1 CONNECT-XSERVER + +# Cleanup +#?*STOP-DAEMON +#?GREETER-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?SESSION-X-1 TERMINATE SIGNAL=15 +#?XSERVER-1 TERMINATE SIGNAL=15 +#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/test-multi-seat-autologin-seat0 b/tests/test-multi-seat-autologin-seat0 new file mode 100755 index 00000000..378448e2 --- /dev/null +++ b/tests/test-multi-seat-autologin-seat0 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner multi-seat-autologin-seat0 test-gobject-greeter diff --git a/tests/test-multi-seat-autologin-seat1 b/tests/test-multi-seat-autologin-seat1 new file mode 100755 index 00000000..a464f2fb --- /dev/null +++ b/tests/test-multi-seat-autologin-seat1 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner multi-seat-autologin-seat1 test-gobject-greeter -- 2.39.2