diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-08-24 15:33:06 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-08-24 15:33:06 +1200 |
| commit | da5e9ae613c8b290a87101ac0635da4ebed86214 (patch) | |
| tree | c756c793cccc54e3cd5dea4fda79f8898529d2e4 /tests/scripts | |
| parent | da9a3e480f3c8007388ddb4bf21f415398350274 (diff) | |
| download | lightdm-da5e9ae613c8b290a87101ac0635da4ebed86214.tar.gz | |
Also support loading config from /usr/share since Debian (stupidly) wont remove files from /etc on package uninstallation even if they've never been modified
Diffstat (limited to 'tests/scripts')
| -rw-r--r-- | tests/scripts/additional-system-config-priority.conf | 31 | ||||
| -rw-r--r-- | tests/scripts/additional-system-config.conf | 30 |
2 files changed, 61 insertions, 0 deletions
diff --git a/tests/scripts/additional-system-config-priority.conf b/tests/scripts/additional-system-config-priority.conf new file mode 100644 index 00000000..1ed1bcba --- /dev/null +++ b/tests/scripts/additional-system-config-priority.conf @@ -0,0 +1,31 @@ +# +# Check LightDM runs with system config.d configuration and the value from /etc is used +# + +[test-runner-config] +additional-system-config=0-additional.conf +additional-config=1-additional.conf + +[SeatDefaults] +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 USER=have-password2 +#?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 diff --git a/tests/scripts/additional-system-config.conf b/tests/scripts/additional-system-config.conf new file mode 100644 index 00000000..5f170c66 --- /dev/null +++ b/tests/scripts/additional-system-config.conf @@ -0,0 +1,30 @@ +# +# Check LightDM runs with system-config.d configuration and the value from the last file is used +# + +[test-runner-config] +additional-system-config=0-additional.conf 1-additional.conf + +[SeatDefaults] +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 USER=have-password2 +#?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 |