diff options
| author | Po-Hsu Lin <po-hsu.lin@canonical.com> | 2015-04-20 16:39:36 +0800 |
|---|---|---|
| committer | Po-Hsu Lin <po-hsu.lin@canonical.com> | 2015-04-20 16:39:36 +0800 |
| commit | c3c8774126ba58151f1571a8985540840ab1fcf8 (patch) | |
| tree | 2d6551afd174a1003fcbbfe4405283fb88812103 /jobs | |
| parent | b654d1d417b5390803769162994ca84dce0c8ad6 (diff) | |
| parent | d69fddab3fd0d43a8cdada5a5d82a1d98233514f (diff) | |
merge with trunk
Diffstat (limited to 'jobs')
| -rw-r--r-- | jobs/esata.txt.in | 2 | ||||
| -rw-r--r-- | jobs/firewire.txt.in | 2 | ||||
| -rw-r--r-- | jobs/graphics-legacy.txt.in | 4 | ||||
| -rw-r--r-- | jobs/graphics.txt.in | 4 | ||||
| -rw-r--r-- | jobs/thunderbolt.pxu | 1 |
5 files changed, 7 insertions, 6 deletions
diff --git a/jobs/esata.txt.in b/jobs/esata.txt.in index e3c1918..e6ec175 100644 --- a/jobs/esata.txt.in +++ b/jobs/esata.txt.in @@ -23,7 +23,7 @@ _description: plugin: user-interact id: esata/remove -depends: esata/storage-test +depends: esata/insert command: removable_storage_watcher remove ata_serial_esata _description: PURPOSE: diff --git a/jobs/firewire.txt.in b/jobs/firewire.txt.in index 67bce5e..a94d749 100644 --- a/jobs/firewire.txt.in +++ b/jobs/firewire.txt.in @@ -25,7 +25,7 @@ _description: plugin: user-interact id: firewire/remove -depends: firewire/storage-test +depends: firewire/insert require: device.category == 'FIREWIRE' command: removable_storage_watcher remove firewire _description: diff --git a/jobs/graphics-legacy.txt.in b/jobs/graphics-legacy.txt.in index 9c2ef40..07f25f0 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 fce7c1b..2eea52b 100644 --- a/jobs/graphics.txt.in +++ b/jobs/graphics.txt.in @@ -466,12 +466,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: diff --git a/jobs/thunderbolt.pxu b/jobs/thunderbolt.pxu index 5da10e5..635e70c 100644 --- a/jobs/thunderbolt.pxu +++ b/jobs/thunderbolt.pxu @@ -23,6 +23,7 @@ _description: plugin: shell id: thunderbolt/storage-test +user: root imports: from 2013.com.canonical.plainbox import manifest requires: manifest.has_thunderbolt == 'True' depends: thunderbolt/insert |