Checkbox

Merge lp:~brendan-donegan/checkbox/story640_automation_squad_tests into lp:checkbox

  1. story640_automation_squad_tests
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Approved by: Daniel Manrique
Approved revision: 1721
Merged at revision: 1733
Proposed branch: lp:~brendan-donegan/checkbox/story640_automation_squad_tests
Merge into: lp:checkbox
Diff against target: 156 lines (+47/-20)
3 files modified
debian/changelog (+3/-1)
jobs/suspend.txt.in (+43/-18)
scripts/bluetooth_test (+1/-1)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/story640_automation_squad_tests
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+127547@code.launchpad.net

Description of the change

The main purpose of this merge is to fix the bluetooth_obex test definitions so that the command output is stripped of invalid characters. There are also one or two changes required to get things to behave correctly during the actual test runs, but there are no bug numbers for those.

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Since translatable descriptions were added to this merge request, should the entry in the changelog be prefixed with [FEATURE] just to make life easier when backporting?

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Yeah, I keep forgetting that

lp:~brendan-donegan/checkbox/story640_automation_squad_tests updated
1720. By Brendan Donegan

Add FEATURE to changelog entry to ease backporting, since descriptions are changed.

1721. By Brendan Donegan

Merged from trunk.

Revision history for this message
Daniel Manrique (roadmr) wrote :

Thanks for FEATUREing it, looks good. Thanks!

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :

Manually merged because tarmac didn't seem to do it for me :/

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

For future reference, it's because one of us forgot to set a commit message - I ought to have done it, but the reviewer also can and it unblocks tarmac and saves you from doing it manually.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-10-03 14:10:31 +0000
3+++ debian/changelog 2012-10-04 07:25:32 +0000
4@@ -150,7 +150,9 @@
5 * Remove networking/bandwidth job since it is not useful (LP: #1009658)
6 * scripts/network_info - add exception handling to file reading so that
7 sensible values are given if the required file cannot be read (LP: #823606)
8-
9+ * [FEATURE] jobs/suspend.txt.in - pipe output of bluetooth_obex jobs through ansi_parser
10+ to avoid invalid characters ending up in the submission.xml (LP: #1060332)
11+
12 [Sylvain Pineau]
13 * jobs/suspend.txt.in: Fixed suspend/suspend_advanced dependencies to avoid
14 calling fwts with the live CD (LP: #1045687)
15
16=== modified file 'jobs/suspend.txt.in'
17--- jobs/suspend.txt.in 2012-09-28 19:55:42 +0000
18+++ jobs/suspend.txt.in 2012-10-04 07:25:32 +0000
19@@ -55,27 +55,25 @@
20 requires:
21 package.name == 'bluez' and package.name == 'obexftp'
22 device.category == 'BLUETOOTH'
23-command: bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send
24+command: set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
25 _description:
26 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
27
28 plugin: shell
29 name: suspend/bluetooth_obex_browse_before_suspend
30-depends: suspend/bluetooth_obex_send_before_suspend
31 requires:
32 package.name == 'bluez' and package.name == 'obexftp'
33 device.category == 'BLUETOOTH'
34-command: bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse
35+command: set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
36 _description:
37 This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
38
39 plugin: shell
40 name: suspend/bluetooth_obex_get_before_suspend
41-depends: suspend/bluetooth_obex_browse_before_suspend
42 requires:
43 package.name == 'bluez' and package.name == 'obexftp'
44 device.category == 'BLUETOOTH'
45-command: bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get; sleep 3; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR remove
46+command: set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
47 _description:
48 This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
49
50@@ -131,7 +129,7 @@
51 This is the automated version of suspend/suspend_advanced.
52 user: root
53 environ: CHECKBOX_DATA
54-command: fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single_log || true; grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single_log
55+command: fwts s3 --s3-sleep-delay=30 -r $CHECKBOX_DATA/suspend_single_log || true; grep 'Critical failures: NONE' $CHECKBOX_DATA/suspend_single_log.log
56
57 plugin: attachment
58 name: suspend/suspend-single-log-attach
59@@ -426,30 +424,59 @@
60 requires:
61 package.name == 'bluez' and package.name == 'obexftp'
62 device.category == 'BLUETOOTH'
63-command: bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send
64+command: set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
65+_description:
66+ This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
67+
68+plugin: shell
69+name: suspend/bluetooth_obex_send_after_suspend_auto
70+depends: suspend/suspend_advanced_auto
71+requires:
72+ package.name == 'bluez' and package.name == 'obexftp'
73+ device.category == 'BLUETOOTH'
74+command: set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR send 2>&1 | ansi_parser
75 _description:
76 This is an automated Bluetooth file transfer test. It sends an image to the device specified by the BTDEVADDR environment variable.
77
78 plugin: shell
79 name: suspend/bluetooth_obex_browse_after_suspend
80-depends: suspend/suspend_advanced suspend/bluetooth_obex_send_after_suspend
81-requires:
82- package.name == 'bluez' and package.name == 'obexftp'
83- device.category == 'BLUETOOTH'
84-command: bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse
85+depends: suspend/suspend_advanced
86+requires:
87+ package.name == 'bluez' and package.name == 'obexftp'
88+ device.category == 'BLUETOOTH'
89+command: set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
90+_description:
91+ This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
92+
93+plugin: shell
94+name: suspend/bluetooth_obex_browse_after_suspend_auto
95+depends: suspend/suspend_advanced_auto
96+requires:
97+ package.name == 'bluez' and package.name == 'obexftp'
98+ device.category == 'BLUETOOTH'
99+command: set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR browse 2>&1 | ansi_parser
100 _description:
101 This is an automated Bluetooth test. It emulates browsing on a remote device specified by the BTDEVADDR environment variable.
102
103 plugin: shell
104 name: suspend/bluetooth_obex_get_after_suspend
105-depends: suspend/suspend_advanced suspend/bluetooth_obex_browse_after_suspend
106+depends: suspend/suspend_advanced
107 requires:
108 package.name == 'bluez' and package.name == 'obexftp'
109 device.category == 'BLUETOOTH'
110-command: bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get; sleep 3; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR remove
111+command: set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
112 _description:
113 This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
114
115+plugin: shell
116+name: suspend/bluetooth_obex_get_after_suspend_auto
117+depends: suspend/suspend_advanced_auto
118+requires:
119+ package.name == 'bluez' and package.name == 'obexftp'
120+ device.category == 'BLUETOOTH'
121+command: set -o pipefail; bluetooth_test $CHECKBOX_SHARE/data/images/JPEG_Color_Image_Ubuntu.jpg $BTDEVADDR get 2>&1 | ansi_parser
122+_description:
123+ This is an automated Bluetooth test. It receives the given file from a remote host specified by the BTDEVADDR environment variable
124
125 plugin: manual
126 name: suspend/bluetooth_obex_after_suspend_manual
127@@ -560,8 +587,7 @@
128 command: network_reconnect_resume_test -t 20 -d wifi
129 _description:
130 Checks the length of time it takes to reconnect an existing wifi connection
131- after a suspend/resume cycle. The timeout is specified with the -t option.
132- Device is specified with a -d option
133+ after a suspend/resume cycle.
134
135 plugin: shell
136 name: suspend/network_resume_time
137@@ -571,5 +597,4 @@
138 command: network_reconnect_resume_test -t 10 -d wired
139 _description:
140 Checks the length of time it takes to reconnect an existing wired connection
141- after a suspend/resume cycle. The timeout is specified with the -t option.
142- Device is specified with a -d option.
143+ after a suspend/resume cycle.
144
145=== modified file 'scripts/bluetooth_test'
146--- scripts/bluetooth_test 2012-08-17 17:04:57 +0000
147+++ scripts/bluetooth_test 2012-10-04 07:25:32 +0000
148@@ -6,7 +6,7 @@
149 BTADDR=$2
150 ACTION=$3
151
152-if ! dpkg-query -l obexftp; then
153+if ! dpkg -l | grep -q obexftp; then
154 echo "You must install obexftp to run this script"
155 exit 1
156 fi

Subscribers

People subscribed via source and target branches