]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Add a test to check seat locking with console kit
authorRobert Ancell <robert.ancell@canonical.com>
Thu, 8 Aug 2013 09:15:11 +0000 (21:15 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Thu, 8 Aug 2013 09:15:11 +0000 (21:15 +1200)
tests/Makefile.am
tests/scripts/lock-seat-console-kit.conf [new file with mode: 0644]
tests/test-lock-seat-console-kit [new file with mode: 0755]

index bf24eb05127e52ef0671e9610b6ed44f101a5a68..4b7d4f556d3ec5fcfda16a97299f02798981f5b7 100644 (file)
@@ -106,6 +106,7 @@ TESTS = \
        test-lock-session \
        test-lock-session-no-password \
        test-lock-session-return-session \
+       test-lock-seat-console-kit \
        test-switch-to-greeter \
        test-switch-to-greeter-new-session \
        test-switch-to-greeter-new-session-logout-new \
@@ -321,6 +322,7 @@ EXTRA_DIST = \
        scripts/language-env.conf \
        scripts/language-no-accounts-service.conf \
        scripts/lock-seat.conf \
+       scripts/lock-seat-console-kit.conf \    
        scripts/lock-seat-return-session.conf \
        scripts/lock-session.conf \
        scripts/lock-session-no-password.conf \
diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf
new file mode 100644 (file)
index 0000000..e49e5d6
--- /dev/null
@@ -0,0 +1,56 @@
+#
+# Check can lock a seat from D-Bus using ConsoleKit
+#
+
+[test-runner-config]
+disable-login1=true
+
+[SeatDefaults]
+autologin-user=have-password1
+user-session=default
+
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Lock the seat
+#?*SESSION-X-0 LOCK-SEAT
+#?SESSION-X-0 LOCK-SEAT
+
+# New X server starts
+#?XSERVER-1 START VT=8
+
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?GREETER-X-1 LOCK-HINT
+
+# Switch to greeter
+#?VT ACTIVATE VT=8
+
+# 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/test-lock-seat-console-kit b/tests/test-lock-seat-console-kit
new file mode 100755 (executable)
index 0000000..8e70968
--- /dev/null
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner lock-seat-console-kit test-gobject-greeter