diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2014-08-27 15:14:05 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2014-08-27 15:14:05 +1200 |
| commit | 07a479990f660dd059b308809f02e516b1db7d80 (patch) | |
| tree | 113379c0da1b09dcb300a11d6f3b09b4addc2444 | |
| parent | 5a7c23b157f5bfb3617fc5554c23e37d7323876b (diff) | |
| download | lightdm-07a479990f660dd059b308809f02e516b1db7d80.tar.gz | |
xdg-seat tests don't make sense anymore
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/scripts/unity-xdg-seat.conf | 40 | ||||
| -rw-r--r-- | tests/scripts/xdg-seat.conf | 31 |
3 files changed, 1 insertions, 76 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index b6bf5160..d499b695 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,7 +56,6 @@ TESTS = \ test-login-guest-session-config \ test-group-membership \ test-xdg-current-desktop \ - test-xdg-seat \ test-language-env \ test-session-stdout \ test-session-stderr \ @@ -206,8 +205,7 @@ TESTS = \ test-unity-mir-lock-seat \ test-unity-mir-session-x-greeter \ test-unity-mir-switch \ - test-unity-mir-switch-to-user-resettable \ - test-unity-xdg-seat + test-unity-mir-switch-to-user-resettable # test-session-exit-error # test-greeter-no-exit @@ -517,7 +515,6 @@ EXTRA_DIST = \ scripts/unity-mir-switch-to-user-resettable.conf \ scripts/unity-plymouth.conf \ scripts/unity-switch.conf \ - scripts/unity-xdg-seat.conf \ scripts/upstart-autologin.conf \ scripts/upstart-login.conf \ scripts/users.conf \ @@ -540,7 +537,6 @@ EXTRA_DIST = \ scripts/vnc-open-file-descriptors.conf \ scripts/xauthority.conf \ scripts/xdg-current-desktop.conf \ - scripts/xdg-seat.conf \ scripts/xdmcp-client.conf \ scripts/xdmcp-server-autologin.conf \ scripts/xdmcp-server-double-login.conf \ diff --git a/tests/scripts/unity-xdg-seat.conf b/tests/scripts/unity-xdg-seat.conf deleted file mode 100644 index f92161e8..00000000 --- a/tests/scripts/unity-xdg-seat.conf +++ /dev/null @@ -1,40 +0,0 @@ -# -# Check xdg-seat option with Unity seat type -# - -[SeatDefaults] -type=unity -autologin-user=have-password1 -user-session=default -xdg-seat=seat1 - -#?*START-DAEMON -#?RUNNER DAEMON-START - -# System compositor starts -#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/mir_socket VT=7 XDG_VTNR=7 -#?*UNITY-SYSTEM-COMPOSITOR READY - -# X server starts -#?XSERVER-0 START SEAT=seat1 MIR-ID=x-0 - -# 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=seat1 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 - -# System compositor switches to session -#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0 - -# Cleanup -#?*STOP-DAEMON -#?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 -#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15 -#?RUNNER DAEMON-EXIT STATUS=0 diff --git a/tests/scripts/xdg-seat.conf b/tests/scripts/xdg-seat.conf deleted file mode 100644 index cde48117..00000000 --- a/tests/scripts/xdg-seat.conf +++ /dev/null @@ -1,31 +0,0 @@ -# -# Check xdg-seat option -# - -[SeatDefaults] -autologin-user=have-password1 -user-session=default -xdg-seat=seat1 - -#?*START-DAEMON -#?RUNNER DAEMON-START - -# X server starts -#?XSERVER-0 START SEAT=seat1 - -# 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=seat1 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 - -# Cleanup -#?*STOP-DAEMON -#?SESSION-X-0 TERMINATE SIGNAL=15 -#?XSERVER-0 TERMINATE SIGNAL=15 -#?RUNNER DAEMON-EXIT STATUS=0 |