Merge lp:~bladernr/checkbox/1149213-improve-removable-storage-tests into lp:checkbox

Proposed by Jeff Lane 
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 1966
Merged at revision: 1975
Proposed branch: lp:~bladernr/checkbox/1149213-improve-removable-storage-tests
Merge into: lp:checkbox
Diff against target: 255 lines (+30/-25)
5 files modified
debian/changelog (+5/-0)
jobs/esata.txt.in (+1/-1)
jobs/firewire.txt.in (+1/-1)
jobs/mediacard.txt.in (+17/-17)
jobs/usb.txt.in (+6/-6)
To merge this branch: bzr merge lp:~bladernr/checkbox/1149213-improve-removable-storage-tests
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+152104@code.launchpad.net

Description of the change

changed the jobs that use removable_storage_test to now write 256MB files. This will make the test longer, but will also help ensure that the writes are simply not being cached and are more representative of real world usage for removable media.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

9 + [Jeff Lane]
10 + * jobs/various: Changed the jobs that use removable_storage_watcher to
11 + generate ~256MB files to combat problems where the files are cached and not
12 + written directly to devices during test. (LP: #1149213)

>>> 256 << 20
268435456

The file you generate is 256 disk-vendor-megabytes big

+1 from me

review: Approve
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

The attempt to merge lp:~bladernr/checkbox/1149213-improve-removable-storage-tests into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Starting tests...
[precise] CheckBox test suite: pass
[precise] Running 'plainbox/setup.py egg_info' failed
[precise] stdout: http://paste.ubuntu.com/5593425/
[precise] stderr: http://paste.ubuntu.com/5593426/
[precise] NOTE: unable to execute tests, marked as failed
[precise] PlainBox test suite: fail
[precise] stdout: http://paste.ubuntu.com/5593427/
[precise] stderr: http://paste.ubuntu.com/5593428/
[precise] Integration tests: fail
[precise] stdout:
[precise] stderr: http://paste.ubuntu.com/5593429/
[precise] Suspending VM
[quantal] Bringing VM 'up'
[quantal] Starting tests...
[quantal] CheckBox test suite: pass
[quantal] PlainBox test suite: pass
[quantal] Integration tests: pass
[quantal] Suspending VM

You are trying to send an empty document, exiting.

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

W dniu 07.03.2013 16:57, Zygmunt Krynicki pisze:
> The attempt to merge
> lp:~bladernr/checkbox/1149213-improve-removable-storage-tests into
> lp:checkbox failed. Below is the output from the failed tests.
>
> [precise] Bringing VM 'up' [precise] Starting tests... [precise]
> CheckBox test suite: pass [precise] Running 'plainbox/setup.py
> egg_info' failed [precise] stdout:
> http://paste.ubuntu.com/5593425/ [precise] stderr:
> http://paste.ubuntu.com/5593426/ [precise] NOTE: unable to execute
> tests, marked as failed [precise] PlainBox test suite: fail
> [precise] stdout: http://paste.ubuntu.com/5593427/ [precise]
> stderr: http://paste.ubuntu.com/5593428/ [precise] Integration
> tests: fail [precise] stdout: [precise] stderr:
> http://paste.ubuntu.com/5593429/ [precise] Suspending VM [quantal]
> Bringing VM 'up' [quantal] Starting tests... [quantal] CheckBox
> test suite: pass [quantal] PlainBox test suite: pass [quantal]
> Integration tests: pass [quantal] Suspending VM
>
> You are trying to send an empty document, exiting.
>

This is caused by the fixed test-in-vagrant.sh being defined in the
tree rather than somewhere alongside. To fix this please rebase on
trunk and push again.

Sorry for the inconvenience.
ZK
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJROLr9AAoJECiU6TooxntH5lQP/1AfTKMH/I7dzMncxxbEE3+L
SJ0ICUgDQKAvyMcf+tEphMN9VFJwBEI2ErlsUX2jumAS5mCLmA8qWybvETvzYiEm
voj/08pE6dSE9nyzGTAwxLyJP+iZh8Oyo1hCIQ7zNGNvGRh9uN6YtbCdq7zUhtTg
tXh/C2hme2iyuMuR0Bl1aF52mCZU/lrShku1qCxc0AxYdP8S4epp/v9LM4fW5ij3
TXZN4/BphTc4YrZvjjtnCU4yEtXm8Qqt0FeEybs59TfNy2TohhjLYANk3qWcgIg5
hKGmhKzdHlKnDdZGIbmdbD61h0ersAYAeeGcQTaPy102PjDAhn3+Siadf1uUjdg3
7LtuKHzfn9c8Up5dBRZJ4EBbxH51SjBew0jqyHqDdW7pe3J9ZXziQT6PbDg9QcYg
B2NFL6OkpiCnkjtlwNhQucAej2UxI9WOFJ+yEAzujjxKMcTt/wqWLgusdeKTSTp9
yAsmQrQuwjEgwsz67YzFapigI9l7yDuW0DYB4mgGJCFeiWbRx+A9nKk/YeN+QSS5
xS4uVklI5n+v0RkZf+Nb04cIld+L4/MjzGv65H84/f+sInP5d0n2F758UEKywLn3
Z5l2tg+majbKHnZoYcKW0NidXzJZkYgHHaUIJqR6hrr9IhlBX4WrpSO1dwjbo9Cy
7rlICXeDGwT/uCOIvOIl
=r4ff
-----END PGP SIGNATURE-----

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

The attempt to merge lp:~bladernr/checkbox/1149213-improve-removable-storage-tests into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Starting tests...
[precise] CheckBox test suite: pass
[precise] Running 'plainbox/setup.py egg_info' failed
[precise] stdout: http://paste.ubuntu.com/5594372/
[precise] stderr: http://paste.ubuntu.com/5594373/
[precise] NOTE: unable to execute tests, marked as failed
[precise] PlainBox test suite: fail
[precise] stdout: http://paste.ubuntu.com/5594374/
[precise] stderr: http://paste.ubuntu.com/5594375/
[precise] Integration tests: fail
[precise] stdout:
[precise] stderr: http://paste.ubuntu.com/5594376/
[precise] Suspending VM
[quantal] Bringing VM 'up'
[quantal] Starting tests...
[quantal] CheckBox test suite: pass
[quantal] PlainBox test suite: pass
[quantal] Integration tests: pass
[quantal] Suspending VM

You are trying to send an empty document, exiting.

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

The attempt to merge lp:~bladernr/checkbox/1149213-improve-removable-storage-tests into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Starting tests...
[precise] CheckBox test suite: pass
[precise] Running 'plainbox/setup.py egg_info' failed
[precise] stdout: http://paste.ubuntu.com/5596158/
[precise] stderr: http://paste.ubuntu.com/5596159/
[precise] NOTE: unable to execute tests, marked as failed
[precise] PlainBox test suite: fail
[precise] stdout: http://paste.ubuntu.com/5596162/
[precise] stderr: http://paste.ubuntu.com/5596163/
[precise] Integration tests: fail
[precise] stdout:
[precise] stderr: http://paste.ubuntu.com/5596164/
[precise] Suspending VM
[quantal] Bringing VM 'up'
[quantal] Starting tests...
[quantal] CheckBox test suite: pass
[quantal] PlainBox test suite: pass
[quantal] Integration tests: pass
[quantal] Suspending VM

You are trying to send an empty document, exiting.

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 2013-03-06 13:26:54 +0000
3+++ debian/changelog 2013-03-07 07:49:25 +0000
4@@ -18,6 +18,11 @@
5 * scripts/network_device_info, scripts/udev_resource,
6 checkbox/parsers/udevadm.py: Use udev to categorise network devices instead
7 of lspci (LP: #1091633)
8+
9+ [Jeff Lane]
10+ * jobs/various: Changed the jobs that use removable_storage_watcher to
11+ generate ~256MB files to combat problems where the files are cached and not
12+ written directly to devices during test. (LP: #1149213)
13
14 -- Jeff Marcom <jeff.marcom@ubuntu.com> Mon, 18 Feb 2013 14:35:27 +0000
15
16
17=== modified file 'jobs/esata.txt.in'
18--- jobs/esata.txt.in 2012-11-12 15:32:12 +0000
19+++ jobs/esata.txt.in 2013-03-07 07:49:25 +0000
20@@ -16,7 +16,7 @@
21 name: esata/storage-test
22 user: root
23 depends: esata/insert
24-command: removable_storage_test ata_serial_esata
25+command: removable_storage_test -s 268400000 ata_serial_esata
26 _description:
27 This is an automated test which performs read/write operations on an attached
28 eSATA HDD
29
30=== modified file 'jobs/firewire.txt.in'
31--- jobs/firewire.txt.in 2012-11-12 15:32:12 +0000
32+++ jobs/firewire.txt.in 2013-03-07 07:49:25 +0000
33@@ -16,7 +16,7 @@
34 name: firewire/storage-test
35 user: root
36 depends: firewire/insert
37-command: removable_storage_test firewire
38+command: removable_storage_test -s 268400000 firewire
39 _description:
40 This is an automated test which performs read/write operations on an attached
41 FireWire HDD
42
43=== modified file 'jobs/mediacard.txt.in'
44--- jobs/mediacard.txt.in 2012-11-16 04:25:09 +0000
45+++ jobs/mediacard.txt.in 2013-03-07 07:49:25 +0000
46@@ -17,7 +17,7 @@
47 name: mediacard/mmc-storage
48 depends: mediacard/mmc-insert
49 user: root
50-command: removable_storage_test --memorycard sdio usb scsi
51+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
52 _description:
53 This test is automated and executes after the mediacard/mmc-insert
54 test is run. It tests reading and writing to the MMC card.
55@@ -57,7 +57,7 @@
56 name: mediacard/mmc-storage-after-suspend
57 depends: mediacard/mmc-insert-after-suspend
58 user: root
59-command: removable_storage_test --memorycard sdio usb scsi
60+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
61 _description:
62 This test is automated and executes after the mediacard/mmc-insert-after-suspend test
63 is run. It tests reading and writing to the MMC card after the system has been suspended.
64@@ -96,7 +96,7 @@
65 name: mediacard/sd-storage
66 depends: mediacard/sd-insert
67 user: root
68-command: removable_storage_test --memorycard sdio usb scsi
69+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
70 _description:
71 This test is automated and executes after the mediacard/sd-insert
72 test is run. It tests reading and writing to the SD card.
73@@ -136,7 +136,7 @@
74 name: mediacard/sd-storage-after-suspend
75 depends: mediacard/sd-insert-after-suspend
76 user: root
77-command: removable_storage_test --memorycard sdio usb scsi
78+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
79 _description:
80 This test is automated and executes after the mediacard/sd-insert-after-suspend test
81 is run. It tests reading and writing to the SD card after the system has been suspended.
82@@ -160,7 +160,7 @@
83 name: mediacard/sd-preinserted
84 user: root
85 requires: device.category == 'CARDREADER'
86-command: removable_storage_test --memorycard -l sdio usb scsi && removable_storage_test --memorycard sdio usb scsi
87+command: removable_storage_test -s 268400000 --memorycard -l sdio usb scsi && removable_storage_test --memorycard sdio usb scsi
88 _description:
89 This is a fully automated version of mediacard/sd-automated and assumes that the
90 system under test has a memory card device plugged in prior to checkbox execution.
91@@ -185,7 +185,7 @@
92 name: mediacard/sdhc-storage
93 depends: mediacard/sdhc-insert
94 user: root
95-command: removable_storage_test --memorycard sdio usb scsi
96+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
97 _description:
98 This test is automated and executes after the mediacard/sdhc-insert
99 test is run. It tests reading and writing to the SDHC card.
100@@ -225,7 +225,7 @@
101 name: mediacard/sdhc-storage-after-suspend
102 depends: mediacard/sdhc-insert-after-suspend
103 user: root
104-command: removable_storage_test --memorycard sdio usb scsi
105+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
106 _description:
107 This test is automated and executes after the mediacard/sdhc-insert-after-suspend test
108 is run. It tests reading and writing to the SDHC card after the system has been suspended.
109@@ -264,7 +264,7 @@
110 name: mediacard/cf-storage
111 depends: mediacard/cf-insert
112 user: root
113-command: removable_storage_test --memorycard sdio usb scsi
114+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
115 _description:
116 This test is automated and executes after the mediacard/cf-insert
117 test is run. It tests reading and writing to the CF card.
118@@ -304,7 +304,7 @@
119 name: mediacard/cf-storage-after-suspend
120 depends: mediacard/cf-insert-after-suspend
121 user: root
122-command: removable_storage_test --memorycard sdio usb scsi
123+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
124 _description:
125 This test is automated and executes after the mediacard/cf-insert-after-suspend test
126 is run. It tests reading and writing to the CF card after the system has been suspended.
127@@ -343,7 +343,7 @@
128 name: mediacard/sdxc-storage
129 depends: mediacard/sdxc-insert
130 user: root
131-command: removable_storage_test --memorycard sdio usb scsi
132+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
133 _description:
134 This test is automated and executes after the mediacard/sdxc-insert
135 test is run. It tests reading and writing to the SDXC card.
136@@ -383,7 +383,7 @@
137 name: mediacard/sdxc-storage-after-suspend
138 depends: mediacard/sdxc-insert-after-suspend
139 user: root
140-command: removable_storage_test --memorycard sdio usb scsi
141+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
142 _description:
143 This test is automated and executes after the mediacard/sdxc-insert-after-suspend test
144 is run. It tests reading and writing to the SDXC card after the system has been suspended.
145@@ -422,7 +422,7 @@
146 name: mediacard/ms-storage
147 depends: mediacard/ms-insert
148 user: root
149-command: removable_storage_test --memorycard sdio usb scsi
150+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
151 _description:
152 This test is automated and executes after the mediacard/ms-insert
153 test is run. It tests reading and writing to the MS card.
154@@ -462,7 +462,7 @@
155 name: mediacard/ms-storage-after-suspend
156 depends: mediacard/ms-insert-after-suspend
157 user: root
158-command: removable_storage_test --memorycard sdio usb scsi
159+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
160 _description:
161 This test is automated and executes after the mediacard/ms-insert-after-suspend test
162 is run. It tests reading and writing to the MS card after the system has been suspended.
163@@ -501,7 +501,7 @@
164 name: mediacard/msp-storage
165 depends: mediacard/msp-insert
166 user: root
167-command: removable_storage_test --memorycard sdio usb scsi
168+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
169 _description:
170 This test is automated and executes after the mediacard/msp-insert
171 test is run. It tests reading and writing to the MSP card.
172@@ -541,7 +541,7 @@
173 name: mediacard/msp-storage-after-suspend
174 depends: mediacard/msp-insert-after-suspend
175 user: root
176-command: removable_storage_test --memorycard sdio usb scsi
177+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
178 _description:
179 This test is automated and executes after the mediacard/msp-insert-after-suspend test
180 is run. It tests reading and writing to the MSP card after the system has been suspended.
181@@ -580,7 +580,7 @@
182 name: mediacard/xd-storage
183 depends: mediacard/xd-insert
184 user: root
185-command: removable_storage_test --memorycard sdio usb scsi
186+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
187 _description:
188 This test is automated and executes after the mediacard/xd-insert
189 test is run. It tests reading and writing to the xD card.
190@@ -620,7 +620,7 @@
191 name: mediacard/xd-storage-after-suspend
192 depends: mediacard/xd-insert-after-suspend
193 user: root
194-command: removable_storage_test --memorycard sdio usb scsi
195+command: removable_storage_test -s 268400000 --memorycard sdio usb scsi
196 _description:
197 This test is automated and executes after the mediacard/xd-insert-after-suspend test
198 is run. It tests reading and writing to the xD card after the system has been suspended.
199
200=== modified file 'jobs/usb.txt.in'
201--- jobs/usb.txt.in 2012-11-12 15:32:12 +0000
202+++ jobs/usb.txt.in 2013-03-07 07:49:25 +0000
203@@ -101,7 +101,7 @@
204 name: usb/storage-transfer
205 depends: usb/insert
206 user: root
207-command: removable_storage_test usb
208+command: removable_storage_test -s 268400000 usb
209 _description:
210 PURPOSE:
211 This test will check your USB connection.
212@@ -119,7 +119,7 @@
213 usb.usb3 == 'supported'
214 depends: usb3/insert
215 user: root
216-command: removable_storage_test -m 500000000 -p 7 usb
217+command: removable_storage_test -s 268400000 -m 500000000 -p 7 usb
218 _description:
219 PURPOSE:
220 This test will check your USB 3.0 connection.
221@@ -135,7 +135,7 @@
222 name: usb/storage-automated
223 depends: usb/insert
224 user: root
225-command: removable_storage_test usb
226+command: removable_storage_test -s 268400000 usb
227 _description:
228 This test is automated and executes after the usb/insert test is run.
229
230@@ -145,14 +145,14 @@
231 usb.usb3 == 'supported'
232 depends: usb3/insert
233 user: root
234-command: removable_storage_test -m 500000000 -p 7 usb
235+command: removable_storage_test -s 268400000 -m 500000000 -p 7 usb
236 _description:
237 This test is automated and executes after the usb3/insert test is run.
238
239 plugin: shell
240 name: usb/storage-preinserted
241 user: root
242-command: removable_storage_test -l usb && removable_storage_test usb
243+command: removable_storage_test -l usb && removable_storage_test -s 268400000 usb
244 _description:
245 This is an automated version of usb/storage-automated and assumes that the
246 server has usb storage devices plugged in prior to checkbox execution. It
247@@ -163,7 +163,7 @@
248 user: root
249 requires:
250 usb.usb3 == 'supported'
251-command: removable_storage_test -l usb && removable_storage_test -m 500000000 -p 7 usb
252+command: removable_storage_test -l usb && removable_storage_test -s 268400000 -m 500000000 -p 7 usb
253 _description:
254 This is an automated version of usb3/storage-automated and assumes that the
255 server has usb 3.0 storage devices plugged in prior to checkbox execution. It

Subscribers

People subscribed via source and target branches