Checkbox

Merge lp:~zyga/checkbox/fix-1377266 into lp:checkbox

  1. fix-1377266
  2. Merge into trunk
Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 3697
Merged at revision: 3701
Proposed branch: lp:~zyga/checkbox/fix-1377266
Merge into: lp:checkbox
Diff against target: 37 lines (+4/-4)
2 files modified
providers/plainbox-provider-checkbox/jobs/graphics-legacy.txt.in (+2/-2)
providers/plainbox-provider-checkbox/jobs/graphics.txt.in (+2/-2)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1377266
Reviewer Review Type Date Requested Status
Maciej Kisielewski Approve
Review via email: mp+256502@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

LGTM, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-checkbox/jobs/graphics-legacy.txt.in'
2--- providers/plainbox-provider-checkbox/jobs/graphics-legacy.txt.in 2015-03-16 09:14:08 +0000
3+++ providers/plainbox-provider-checkbox/jobs/graphics-legacy.txt.in 2015-04-16 14:24:03 +0000
4@@ -229,12 +229,12 @@
5 requires: package.name == 'fswebcam'
6 command:
7 [ -f ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }
8- dbus-launch gsettings set org.gnome.totem repeat true
9+ gsettings set org.gnome.totem repeat true
10 totem --fullscreen ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv 2>/dev/null &
11 set -o pipefail
12 sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg -q 2>&1 | ansi_parser
13 sleep 5 && totem --quit 2>/dev/null
14- dbus-launch gsettings set org.gnome.totem repeat false
15+ gsettings set org.gnome.totem repeat false
16 _summary: Test FSV screenshot
17 _description:
18 PURPOSE:
19
20=== modified file 'providers/plainbox-provider-checkbox/jobs/graphics.txt.in'
21--- providers/plainbox-provider-checkbox/jobs/graphics.txt.in 2015-03-16 09:14:08 +0000
22+++ providers/plainbox-provider-checkbox/jobs/graphics.txt.in 2015-04-16 14:24:03 +0000
23@@ -458,12 +458,12 @@
24 requires: package.name == 'fswebcam'
25 command:
26 [ -f ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv ] || { echo "Video file not found"; exit 1; }
27- dbus-launch gsettings set org.gnome.totem repeat true
28+ gsettings set org.gnome.totem repeat true
29 totem --fullscreen ${PLAINBOX_PROVIDER_DATA}/video/Ogg_Theora_Video.ogv 2>/dev/null &
30 set -o pipefail
31 sleep 15 && camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video_${index}.jpg -q 2>&1 | ansi_parser
32 sleep 5 && totem --quit 2>/dev/null
33- dbus-launch gsettings set org.gnome.totem repeat false
34+ gsettings set org.gnome.totem repeat false
35 _summary: Test FSV screenshot for $product
36 _description:
37 PURPOSE:

Subscribers

People subscribed via source and target branches