diff options
| author | Zygmunt Krynicki <zygmunt.krynicki@canonical.com> | 2015-04-16 16:23:08 +0200 |
|---|---|---|
| committer | Zygmunt Krynicki <zygmunt.krynicki@canonical.com> | 2015-04-16 16:23:08 +0200 |
| commit | 1394ea85ff0810425e90cd0eb5a03d0d37dc3424 (patch) | |
| tree | 9f7db9833ca7e7e5c059e69f11cb472eaa42cef3 | |
| parent | 78985c11140c715de9ec53c928a8bf12d47afcac (diff) | |
providers:checkbox: don't use dbus-launch
Using dbus-launch is always wrong, as explained in the bug linked below. Fixes: https://bugs.launchpad.net/plainbox-provider-checkbox/+bug/1377266 Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
| -rw-r--r-- | jobs/graphics-legacy.txt.in | 4 | ||||
| -rw-r--r-- | jobs/graphics.txt.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/jobs/graphics-legacy.txt.in b/jobs/graphics-legacy.txt.in index 9c2ef401..07f25f01 100644 --- a/jobs/graphics-legacy.txt.in +++ b/jobs/graphics-legacy.txt.in @@ -229,12 +229,12 @@ id: graphics/screenshot_fullscreen_video requires: package.name == 'fswebcam' command: [ -f ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; } - dbus-launch gsettings set org.gnome.totem repeat true + gsettings set org.gnome.totem repeat true totem --fullscreen ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv 2>/dev/null & set -o pipefail sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser sleep 5 && totem --quit 2>/dev/null - dbus-launch gsettings set org.gnome.totem repeat false + gsettings set org.gnome.totem repeat false _summary: Test FSV screenshot _description: PURPOSE: diff --git a/jobs/graphics.txt.in b/jobs/graphics.txt.in index 340b68fa..00a57ade 100644 --- a/jobs/graphics.txt.in +++ b/jobs/graphics.txt.in @@ -458,12 +458,12 @@ command: requires: package.name == 'fswebcam' command: [ -f ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; } - dbus-launch gsettings set org.gnome.totem repeat true + gsettings set org.gnome.totem repeat true totem --fullscreen ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv 2>/dev/null & set -o pipefail sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video_${index}.jpg -q 2>&1 | ansi_parser sleep 5 && totem --quit 2>/dev/null - dbus-launch gsettings set org.gnome.totem repeat false + gsettings set org.gnome.totem repeat false _summary: Test FSV screenshot for $product _description: PURPOSE: |