summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2015-11-20 14:17:57 +1300
committerRobert Ancell <robert.ancell@canonical.com>2015-11-20 14:17:57 +1300
commit74c5cddebdc739878d3e6cfa69ec0a6ea7c1d02a (patch)
treec7ee5b9830e01df276de07bf4e5b590d203c85dc
parent0eacdf1c6a096167a262e1462f738bccd68cf81a (diff)
downloadlightdm-git-74c5cddebdc739878d3e6cfa69ec0a6ea7c1d02a.tar.gz
Remove .moved files
-rw-r--r--tests/scripts/xdmcp-client.conf.moved27
-rw-r--r--tests/scripts/xdmcp-server-autologin.conf.moved45
-rw-r--r--tests/scripts/xdmcp-server-double-login.conf.moved100
-rw-r--r--tests/scripts/xdmcp-server-guest.conf.moved62
4 files changed, 0 insertions, 234 deletions
diff --git a/tests/scripts/xdmcp-client.conf.moved b/tests/scripts/xdmcp-client.conf.moved
deleted file mode 100644
index ea42cd8d..00000000
--- a/tests/scripts/xdmcp-client.conf.moved
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Check can run a local XDMCP client
-#
-
-[SeatDefaults]
-xdmcp-manager=localhost
-xdmcp-port=9999
-
-#?*START-DAEMON
-#?RUNNER DAEMON-START
-
-# X server starts
-#?XSERVER-0 START VT=7 LISTEN-TCP SEAT=seat0
-#?*XSERVER-0 INDICATE-READY
-#?XSERVER-0 INDICATE-READY
-#?XSERVER-0 ACCEPT-CONNECT
-
-# Send an XDMCP queriy
-#?*XSERVER-0 SEND-QUERY
-
-# Wait to check a greeter is not started
-#?*WAIT
-
-# Cleanup
-#?*STOP-DAEMON
-#?XSERVER-0 TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/xdmcp-server-autologin.conf.moved b/tests/scripts/xdmcp-server-autologin.conf.moved
deleted file mode 100644
index f0ac8740..00000000
--- a/tests/scripts/xdmcp-server-autologin.conf.moved
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Check that a remote X server can autologin via XDMCP
-#
-
-[LightDM]
-start-default-seat=false
-
-[XDMCPServer]
-enabled=true
-
-[SeatDefaults]
-user-session=default
-autologin-user=have-password1
-
-#?*START-DAEMON
-#?RUNNER DAEMON-START
-#?*WAIT
-
-# Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
-#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX
-
-# Start sending XDMCP queries
-#?*XSERVER-98 START-XDMCP
-#?XSERVER-98 SEND-QUERY
-
-# Negotiate with daemon
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
-#?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
-#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1"
-#?*XSERVER-98 SEND-MANAGE
-
-# LightDM connects to X server
-#?XSERVER-98 ACCEPT-CONNECT
-
-# Session starts
-#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION SESSION=c0
-#?XSERVER-98 ACCEPT-CONNECT
-#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
-
-# Clean up
-#?*STOP-DAEMON
-#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/xdmcp-server-double-login.conf.moved b/tests/scripts/xdmcp-server-double-login.conf.moved
deleted file mode 100644
index 3c7a0506..00000000
--- a/tests/scripts/xdmcp-server-double-login.conf.moved
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Check that two remote X servers can login via XDMCP
-#
-
-[LightDM]
-start-default-seat=false
-
-[XDMCPServer]
-enabled=true
-
-[SeatDefaults]
-user-session=default
-
-#?*START-DAEMON
-#?RUNNER DAEMON-START
-#?*WAIT
-
-# Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
-#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX
-
-# Start sending XDMCP queries
-#?*XSERVER-98 START-XDMCP
-#?XSERVER-98 SEND-QUERY
-
-# Negotiate with daemon
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
-#?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
-#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1"
-#?*XSERVER-98 SEND-MANAGE
-
-# LightDM connects to X server
-#?XSERVER-98 ACCEPT-CONNECT
-
-# Greeter starts and connects to remote X server
-#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION SESSION=c0
-#?XSERVER-98 ACCEPT-CONNECT
-#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
-#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
-#?GREETER-X-127.0.0.1:98 CONNECTED-TO-DAEMON
-
-# Log in
-#?*GREETER-X-127.0.0.1:98 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-127.0.0.1:98 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-127.0.0.1:98 RESPOND TEXT="password"
-#?GREETER-X-127.0.0.1:98 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-127.0.0.1:98 START-SESSION
-#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15
-
-# Session starts
-#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION SESSION=c1
-#?XSERVER-98 ACCEPT-CONNECT
-#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
-
-# Start a second remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":99 -query 127.0.0.1 -nolisten unix"
-#?XSERVER-99 START LISTEN-TCP NO-LISTEN-UNIX
-
-# Start sending XDMCP queries
-#?*XSERVER-99 START-XDMCP
-#?XSERVER-99 SEND-QUERY
-
-# Negotiate with daemon
-#?XSERVER-99 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
-#?*XSERVER-99 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
-#?XSERVER-99 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1"
-#?*XSERVER-99 SEND-MANAGE
-
-# LightDM connects to X server
-#?XSERVER-99 ACCEPT-CONNECT
-
-# Greeter starts and connects to remote X server
-#?GREETER-X-127.0.0.1:99 START XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION SESSION=c2
-#?XSERVER-99 ACCEPT-CONNECT
-#?GREETER-X-127.0.0.1:99 CONNECT-XSERVER
-#?GREETER-X-127.0.0.1:99 CONNECT-TO-DAEMON
-#?GREETER-X-127.0.0.1:99 CONNECTED-TO-DAEMON
-
-# Log in
-#?*GREETER-X-127.0.0.1:99 AUTHENTICATE USERNAME=have-password1
-#?GREETER-X-127.0.0.1:99 SHOW-PROMPT TEXT="Password:"
-#?*GREETER-X-127.0.0.1:99 RESPOND TEXT="password"
-#?GREETER-X-127.0.0.1:99 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER-X-127.0.0.1:99 START-SESSION
-#?GREETER-X-127.0.0.1:99 TERMINATE SIGNAL=15
-
-# Session starts
-#?SESSION-X-127.0.0.1:99 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION SESSION=c3
-#?XSERVER-99 ACCEPT-CONNECT
-#?SESSION-X-127.0.0.1:99 CONNECT-XSERVER
-
-# Clean up
-#?*STOP-DAEMON
-#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15
-#?SESSION-X-127.0.0.1:99 TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/xdmcp-server-guest.conf.moved b/tests/scripts/xdmcp-server-guest.conf.moved
deleted file mode 100644
index 7cd25955..00000000
--- a/tests/scripts/xdmcp-server-guest.conf.moved
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Check can log into a guest account via XDMCP
-#
-
-[LightDM]
-start-default-seat=false
-
-[XDMCPServer]
-enabled=true
-
-[SeatDefaults]
-user-session=default
-
-#?*START-DAEMON
-#?RUNNER DAEMON-START
-#?*WAIT
-
-# Start a remote X server to log in with XDMCP
-#?*START-XSERVER ARGS=":98 -query 127.0.0.1 -nolisten unix"
-#?XSERVER-98 START LISTEN-TCP NO-LISTEN-UNIX
-
-# Start sending XDMCP queries
-#?*XSERVER-98 START-XDMCP
-#?XSERVER-98 SEND-QUERY
-
-# Negotiate with daemon
-#?XSERVER-98 GOT-WILLING AUTHENTICATION-NAME="" HOSTNAME="" STATUS=""
-#?*XSERVER-98 SEND-REQUEST ADDRESSES="127.0.0.1" AUTHORIZATION-NAMES="MIT-MAGIC-COOKIE-1" MFID="TEST XSERVER"
-#?XSERVER-98 GOT-ACCEPT SESSION-ID=[0-9]* AUTHENTICATION-NAME="" AUTHORIZATION-NAME="MIT-MAGIC-COOKIE-1"
-#?*XSERVER-98 SEND-MANAGE
-
-# LightDM connects to X server
-#?XSERVER-98 ACCEPT-CONNECT
-
-# Greeter starts and connects to remote X server
-#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
-#?LOGIN1 ACTIVATE-SESSION SESSION=c0
-#?XSERVER-98 ACCEPT-CONNECT
-#?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
-#?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
-#?GREETER-X-127.0.0.1:98 CONNECTED-TO-DAEMON
-
-# Log in
-#?*GREETER-X-127.0.0.1:98 AUTHENTICATE-GUEST
-#?GREETER-X-127.0.0.1:98 AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-#?*GREETER-X-127.0.0.1:98 START-SESSION
-#?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15
-
-# Guest account created
-#?GUEST-ACCOUNT ADD USERNAME=guest-.*
-
-# Guest session starts
-#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
-#?LOGIN1 ACTIVATE-SESSION SESSION=c1
-#?XSERVER-98 ACCEPT-CONNECT
-#?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
-
-# Clean up
-#?*STOP-DAEMON
-#?SESSION-X-127.0.0.1:98 TERMINATE SIGNAL=15
-#?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
-#?RUNNER DAEMON-EXIT STATUS=0