diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2012-02-02 15:56:59 +1100 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2012-02-02 15:56:59 +1100 |
| commit | 887501a57bc979bed28380a4be8e523b666f6c02 (patch) | |
| tree | 568cecb2f0ee9adc42b8fc3289498ad5a900cc4f /tests/scripts | |
| parent | bc29eb77d16e6ade91f310be22d849410443e0de (diff) | |
| download | lightdm-887501a57bc979bed28380a4be8e523b666f6c02.tar.gz | |
Handle race condition in Plymouth test
Diffstat (limited to 'tests/scripts')
| -rw-r--r-- | tests/scripts/plymouth-inactive-vt.conf | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf index ddc27816..c72adb22 100644 --- a/tests/scripts/plymouth-inactive-vt.conf +++ b/tests/scripts/plymouth-inactive-vt.conf @@ -11,14 +11,13 @@ active=true #?RUNNER DAEMON-START -# Check if Plymouth is running -#?PLYMOUTH PING ACTIVE=TRUE -#?PLYMOUTH HAS-ACTIVE-VT=FALSE -#?PLYMOUTH QUIT RETAIN-SPLASH=FALSE - -# X server starts -#?XSERVER :50 START -#?XSERVER :50 INDICATE-READY +# Check if Plymouth is running, then start X server +# The Plymouth interaction and X server interaction can happen at the same time +#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) +#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) +#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) +#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) +#?(PLYMOUTH PING ACTIVE=TRUE|PLYMOUTH HAS-ACTIVE-VT=FALSE|PLYMOUTH QUIT RETAIN-SPLASH=FALSE|XSERVER :50 START|XSERVER :50 INDICATE-READY) # LightDM connects to X server #?XSERVER :50 ACCEPT-CONNECT |