Light Display Manager

Merge lp:~robert-ancell/lightdm/test-multi-seat into lp:lightdm

  1. test-multi-seat
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Merged at revision: 1934
Proposed branch: lp:~robert-ancell/lightdm/test-multi-seat
Merge into: lp:lightdm
Diff against target: 73 lines (+46/-0)
3 files modified
tests/Makefile.am (+2/-0)
tests/scripts/multi-seat.conf (+42/-0)
tests/test-multi-seat (+2/-0)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/test-multi-seat
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+211239@code.launchpad.net

Commit message

Add a basic test to confirm multi-seat works

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/Makefile.am'
2--- tests/Makefile.am 2014-03-14 02:25:25 +0000
3+++ tests/Makefile.am 2014-03-17 03:38:44 +0000
4@@ -164,6 +164,7 @@
5 test-gobject-power-no-services \
6 test-open-file-descriptors \
7 test-xdmcp-server-open-file-descriptors \
8+ test-multi-seat \
9 test-mir-autologin \
10 test-mir-greeter \
11 test-mir-session \
12@@ -418,6 +419,7 @@
13 scripts/mir-session.conf \
14 scripts/mir-session-compositor-crash.conf \
15 scripts/mir-session-crash.conf \
16+ scripts/multi-seat.conf \
17 scripts/no-accounts-service.conf \
18 scripts/no-config.conf \
19 scripts/no-console-kit.conf \
20
21=== added file 'tests/scripts/multi-seat.conf'
22--- tests/scripts/multi-seat.conf 1970-01-01 00:00:00 +0000
23+++ tests/scripts/multi-seat.conf 2014-03-17 03:38:44 +0000
24@@ -0,0 +1,42 @@
25+#
26+# Check can run two seats at once
27+#
28+
29+[Seat:0]
30+xdg-seat=seat0
31+
32+[Seat:1]
33+xdg-seat=seat1
34+
35+#?*START-DAEMON
36+#?RUNNER DAEMON-START
37+
38+# Seat0 starts
39+#?XSERVER-0 START VT=7 SEAT=seat0
40+#?*XSERVER-0 INDICATE-READY
41+#?XSERVER-0 INDICATE-READY
42+#?XSERVER-0 ACCEPT-CONNECT
43+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
44+#?XSERVER-0 ACCEPT-CONNECT
45+#?GREETER-X-0 CONNECT-XSERVER
46+#?GREETER-X-0 CONNECT-TO-DAEMON
47+#?GREETER-X-0 CONNECTED-TO-DAEMON
48+
49+# Seat1 starts (can't use VTs)
50+#?XSERVER-1 START SEAT=seat1
51+#?*XSERVER-1 INDICATE-READY
52+#?XSERVER-1 INDICATE-READY
53+#?XSERVER-1 ACCEPT-CONNECT
54+#?GREETER-X-1 START XDG_SEAT=seat1 XDG_SESSION_CLASS=greeter
55+#?XSERVER-1 ACCEPT-CONNECT
56+#?GREETER-X-1 CONNECT-XSERVER
57+#?GREETER-X-1 CONNECT-TO-DAEMON
58+#?GREETER-X-1 CONNECTED-TO-DAEMON
59+
60+# Cleanup
61+#?*STOP-DAEMON
62+#?GREETER-X-0 TERMINATE SIGNAL=15
63+#?GREETER-X-1 TERMINATE SIGNAL=15
64+#?XSERVER-0 TERMINATE SIGNAL=15
65+#?XSERVER-1 TERMINATE SIGNAL=15
66+#?RUNNER DAEMON-EXIT STATUS=0
67
68=== added file 'tests/test-multi-seat'
69--- tests/test-multi-seat 1970-01-01 00:00:00 +0000
70+++ tests/test-multi-seat 2014-03-17 03:38:44 +0000
71@@ -0,0 +1,2 @@
72+#!/bin/sh
73+./src/dbus-env ./src/test-runner multi-seat test-gobject-greeter

Subscribers

People subscribed via source and target branches