Merge lp:~bladernr/checkbox/970857-clean-up-mmc-test-instructions into lp:checkbox
- 970857-clean-up-mmc-test-instructions
- Merge into trunk
Proposed by
Jeff Lane
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Daniel Manrique | ||||
Approved revision: | 2096 | ||||
Merged at revision: | 2096 | ||||
Proposed branch: | lp:~bladernr/checkbox/970857-clean-up-mmc-test-instructions | ||||
Merge into: | lp:checkbox | ||||
Diff against target: |
200 lines (+35/-16) 2 files modified
debian/changelog (+2/-0) jobs/mediacard.txt.in (+33/-16) |
||||
To merge this branch: | bzr merge lp:~bladernr/checkbox/970857-clean-up-mmc-test-instructions | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Manrique (community) | Approve | ||
Review via email: mp+161870@code.launchpad.net |
Commit message
Description of the change
Modifies the test instructions for the media card tests to be less confusing.
To post a comment you must log in.
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-05-01 13:48:13 +0000 | |||
3 | +++ debian/changelog 2013-05-01 16:27:32 +0000 | |||
4 | @@ -4,6 +4,8 @@ | |||
5 | 4 | * scripts/cpu_offlining: Modified script to no longer offline cpu0 to resolve | 4 | * scripts/cpu_offlining: Modified script to no longer offline cpu0 to resolve |
6 | 5 | a bug on ARM. Modified output so most of it is redirected to stderr for | 5 | a bug on ARM. Modified output so most of it is redirected to stderr for |
7 | 6 | fail cases, we don't need that much for success cases. (LP: #1078897) | 6 | fail cases, we don't need that much for success cases. (LP: #1078897) |
8 | 7 | * jobs/mediacard.txt.in: Modified test instructions to be less confusing | ||
9 | 8 | (LP: #970857) | ||
10 | 7 | 9 | ||
11 | 8 | -- Brendan Donegan <brendan.donegan@canonical.com> Fri, 26 Apr 2013 18:23:03 +0100 | 10 | -- Brendan Donegan <brendan.donegan@canonical.com> Fri, 26 Apr 2013 18:23:03 +0100 |
12 | 9 | 11 | ||
13 | 10 | 12 | ||
14 | === modified file 'jobs/mediacard.txt.in' | |||
15 | --- jobs/mediacard.txt.in 2013-04-10 16:21:55 +0000 | |||
16 | +++ jobs/mediacard.txt.in 2013-05-01 16:27:32 +0000 | |||
17 | @@ -7,8 +7,9 @@ | |||
18 | 7 | detect the insertion of a Multimedia Card (MMC) media | 7 | detect the insertion of a Multimedia Card (MMC) media |
19 | 8 | STEPS: | 8 | STEPS: |
20 | 9 | 1. Click "Test" and insert an MMC card into the reader. | 9 | 1. Click "Test" and insert an MMC card into the reader. |
21 | 10 | If a file browser opens up, you can safely close it. | ||
22 | 10 | (Note: this test will time-out after 20 seconds.) | 11 | (Note: this test will time-out after 20 seconds.) |
24 | 11 | 2. Do not unplug the device after the test. | 12 | 2. Do not remove the device after this test. |
25 | 12 | VERIFICATION: | 13 | VERIFICATION: |
26 | 13 | The verification of this test is automated. Do not change the | 14 | The verification of this test is automated. Do not change the |
27 | 14 | automatically selected result. | 15 | automatically selected result. |
28 | @@ -47,8 +48,9 @@ | |||
29 | 47 | detect the insertion of an MMC card after the system has been suspended | 48 | detect the insertion of an MMC card after the system has been suspended |
30 | 48 | STEPS: | 49 | STEPS: |
31 | 49 | 1. Click "Test" and insert an MMC card into the reader. | 50 | 1. Click "Test" and insert an MMC card into the reader. |
32 | 51 | If a file browser opens up, you can safely close it. | ||
33 | 50 | (Note: this test will time-out after 20 seconds.) | 52 | (Note: this test will time-out after 20 seconds.) |
35 | 51 | 2. Do not unplug the device after the test. | 53 | 2. Do not remove the device after this test. |
36 | 52 | VERIFICATION: | 54 | VERIFICATION: |
37 | 53 | The verification of this test is automated. Do not change the | 55 | The verification of this test is automated. Do not change the |
38 | 54 | automatically selected result. | 56 | automatically selected result. |
39 | @@ -86,8 +88,9 @@ | |||
40 | 86 | detect the insertion of a Secure Digital (SD) media card | 88 | detect the insertion of a Secure Digital (SD) media card |
41 | 87 | STEPS: | 89 | STEPS: |
42 | 88 | 1. Click "Test" and insert an SD card into the reader. | 90 | 1. Click "Test" and insert an SD card into the reader. |
43 | 91 | If a file browser opens up, you can safely close it. | ||
44 | 89 | (Note: this test will time-out after 20 seconds.) | 92 | (Note: this test will time-out after 20 seconds.) |
46 | 90 | 2. Do not unplug the device after the test. | 93 | 2. Do not remove the device after this test. |
47 | 91 | VERIFICATION: | 94 | VERIFICATION: |
48 | 92 | The verification of this test is automated. Do not change the | 95 | The verification of this test is automated. Do not change the |
49 | 93 | automatically selected result. | 96 | automatically selected result. |
50 | @@ -126,8 +129,9 @@ | |||
51 | 126 | detect the insertion of an SD card after the system has been suspended | 129 | detect the insertion of an SD card after the system has been suspended |
52 | 127 | STEPS: | 130 | STEPS: |
53 | 128 | 1. Click "Test" and insert an SD card into the reader. | 131 | 1. Click "Test" and insert an SD card into the reader. |
54 | 132 | If a file browser opens up, you can safely close it. | ||
55 | 129 | (Note: this test will time-out after 20 seconds.) | 133 | (Note: this test will time-out after 20 seconds.) |
57 | 130 | 2. Do not unplug the device after the test. | 134 | 2. Do not remove the device after this test. |
58 | 131 | VERIFICATION: | 135 | VERIFICATION: |
59 | 132 | The verification of this test is automated. Do not change the | 136 | The verification of this test is automated. Do not change the |
60 | 133 | automatically selected result. | 137 | automatically selected result. |
61 | @@ -175,8 +179,9 @@ | |||
62 | 175 | detect the insertion of a Secure Digital High-Capacity (SDHC) media card | 179 | detect the insertion of a Secure Digital High-Capacity (SDHC) media card |
63 | 176 | STEPS: | 180 | STEPS: |
64 | 177 | 1. Click "Test" and insert an SDHC card into the reader. | 181 | 1. Click "Test" and insert an SDHC card into the reader. |
65 | 182 | If a file browser opens up, you can safely close it. | ||
66 | 178 | (Note: this test will time-out after 20 seconds.) | 183 | (Note: this test will time-out after 20 seconds.) |
68 | 179 | 2. Do not unplug the device after the test. | 184 | 2. Do not remove the device after this test. |
69 | 180 | VERIFICATION: | 185 | VERIFICATION: |
70 | 181 | The verification of this test is automated. Do not change the | 186 | The verification of this test is automated. Do not change the |
71 | 182 | automatically selected result. | 187 | automatically selected result. |
72 | @@ -215,8 +220,9 @@ | |||
73 | 215 | detect the insertion of an SDHC media card after the system has been suspended | 220 | detect the insertion of an SDHC media card after the system has been suspended |
74 | 216 | STEPS: | 221 | STEPS: |
75 | 217 | 1. Click "Test" and insert an SDHC card into the reader. | 222 | 1. Click "Test" and insert an SDHC card into the reader. |
76 | 223 | If a file browser opens up, you can safely close it. | ||
77 | 218 | (Note: this test will time-out after 20 seconds.) | 224 | (Note: this test will time-out after 20 seconds.) |
79 | 219 | 2. Do not unplug the device after the test. | 225 | 2. Do not remove the device after this test. |
80 | 220 | VERIFICATION: | 226 | VERIFICATION: |
81 | 221 | The verification of this test is automated. Do not change the | 227 | The verification of this test is automated. Do not change the |
82 | 222 | automatically selected result. | 228 | automatically selected result. |
83 | @@ -254,8 +260,9 @@ | |||
84 | 254 | detect the insertion of a Compact Flash (CF) media card | 260 | detect the insertion of a Compact Flash (CF) media card |
85 | 255 | STEPS: | 261 | STEPS: |
86 | 256 | 1. Click "Test" and insert a CF card into the reader. | 262 | 1. Click "Test" and insert a CF card into the reader. |
87 | 263 | If a file browser opens up, you can safely close it. | ||
88 | 257 | (Note: this test will time-out after 20 seconds.) | 264 | (Note: this test will time-out after 20 seconds.) |
90 | 258 | 2. Do not unplug the device after the test. | 265 | 2. Do not remove the device after this test. |
91 | 259 | VERIFICATION: | 266 | VERIFICATION: |
92 | 260 | The verification of this test is automated. Do not change the | 267 | The verification of this test is automated. Do not change the |
93 | 261 | automatically selected result. | 268 | automatically selected result. |
94 | @@ -294,8 +301,9 @@ | |||
95 | 294 | detect the insertion of a CF card after the system has been suspended | 301 | detect the insertion of a CF card after the system has been suspended |
96 | 295 | STEPS: | 302 | STEPS: |
97 | 296 | 1. Click "Test" and insert a CF card into the reader. | 303 | 1. Click "Test" and insert a CF card into the reader. |
98 | 304 | If a file browser opens up, you can safely close it. | ||
99 | 297 | (Note: this test will time-out after 20 seconds.) | 305 | (Note: this test will time-out after 20 seconds.) |
101 | 298 | 2. Do not unplug the device after the test. | 306 | 2. Do not remove the device after this test. |
102 | 299 | VERIFICATION: | 307 | VERIFICATION: |
103 | 300 | The verification of this test is automated. Do not change the | 308 | The verification of this test is automated. Do not change the |
104 | 301 | automatically selected result. | 309 | automatically selected result. |
105 | @@ -333,8 +341,9 @@ | |||
106 | 333 | detect the insertion of a Secure Digital Extended Capacity (SDXC) media card | 341 | detect the insertion of a Secure Digital Extended Capacity (SDXC) media card |
107 | 334 | STEPS: | 342 | STEPS: |
108 | 335 | 1. Click "Test" and insert a SDXC card into the reader. | 343 | 1. Click "Test" and insert a SDXC card into the reader. |
109 | 344 | If a file browser opens up, you can safely close it. | ||
110 | 336 | (Note: this test will time-out after 20 seconds.) | 345 | (Note: this test will time-out after 20 seconds.) |
112 | 337 | 2. Do not unplug the device after the test. | 346 | 2. Do not remove the device after this test. |
113 | 338 | VERIFICATION: | 347 | VERIFICATION: |
114 | 339 | The verification of this test is automated. Do not change the | 348 | The verification of this test is automated. Do not change the |
115 | 340 | automatically selected result. | 349 | automatically selected result. |
116 | @@ -373,8 +382,9 @@ | |||
117 | 373 | detect the insertion of a SDXC card after the system has been suspended | 382 | detect the insertion of a SDXC card after the system has been suspended |
118 | 374 | STEPS: | 383 | STEPS: |
119 | 375 | 1. Click "Test" and insert a SDXC card into the reader. | 384 | 1. Click "Test" and insert a SDXC card into the reader. |
120 | 385 | If a file browser opens up, you can safely close it. | ||
121 | 376 | (Note: this test will time-out after 20 seconds.) | 386 | (Note: this test will time-out after 20 seconds.) |
123 | 377 | 2. Do not unplug the device after the test. | 387 | 2. Do not remove the device after this test. |
124 | 378 | VERIFICATION: | 388 | VERIFICATION: |
125 | 379 | The verification of this test is automated. Do not change the | 389 | The verification of this test is automated. Do not change the |
126 | 380 | automatically selected result. | 390 | automatically selected result. |
127 | @@ -398,6 +408,7 @@ | |||
128 | 398 | of a SDXC card from the systems card reader after the system has been suspended. | 408 | of a SDXC card from the systems card reader after the system has been suspended. |
129 | 399 | STEPS: | 409 | STEPS: |
130 | 400 | 1. Click "Test" and remove the SDXC card from the reader. | 410 | 1. Click "Test" and remove the SDXC card from the reader. |
131 | 411 | If a file browser opens up, you can safely close it. | ||
132 | 401 | (Note: this test will time-out after 20 seconds.) | 412 | (Note: this test will time-out after 20 seconds.) |
133 | 402 | VERIFICATION: | 413 | VERIFICATION: |
134 | 403 | The verification of this test is automated. Do not change the | 414 | The verification of this test is automated. Do not change the |
135 | @@ -412,8 +423,9 @@ | |||
136 | 412 | detect the insertion of a Memory Stick (MS) media card | 423 | detect the insertion of a Memory Stick (MS) media card |
137 | 413 | STEPS: | 424 | STEPS: |
138 | 414 | 1. Click "Test" and insert a MS card into the reader. | 425 | 1. Click "Test" and insert a MS card into the reader. |
139 | 426 | If a file browser opens up, you can safely close it. | ||
140 | 415 | (Note: this test will time-out after 20 seconds.) | 427 | (Note: this test will time-out after 20 seconds.) |
142 | 416 | 2. Do not unplug the device after the test. | 428 | 2. Do not remove the device after this test. |
143 | 417 | VERIFICATION: | 429 | VERIFICATION: |
144 | 418 | The verification of this test is automated. Do not change the | 430 | The verification of this test is automated. Do not change the |
145 | 419 | automatically selected result. | 431 | automatically selected result. |
146 | @@ -452,8 +464,9 @@ | |||
147 | 452 | detect the insertion of a MS card after the system has been suspended | 464 | detect the insertion of a MS card after the system has been suspended |
148 | 453 | STEPS: | 465 | STEPS: |
149 | 454 | 1. Click "Test" and insert a MS card into the reader. | 466 | 1. Click "Test" and insert a MS card into the reader. |
150 | 467 | If a file browser opens up, you can safely close it. | ||
151 | 455 | (Note: this test will time-out after 20 seconds.) | 468 | (Note: this test will time-out after 20 seconds.) |
153 | 456 | 2. Do not unplug the device after the test. | 469 | 2. Do not remove the device after this test. |
154 | 457 | VERIFICATION: | 470 | VERIFICATION: |
155 | 458 | The verification of this test is automated. Do not change the | 471 | The verification of this test is automated. Do not change the |
156 | 459 | automatically selected result. | 472 | automatically selected result. |
157 | @@ -491,8 +504,9 @@ | |||
158 | 491 | detect the insertion of a Memory Stick Pro (MSP) media card | 504 | detect the insertion of a Memory Stick Pro (MSP) media card |
159 | 492 | STEPS: | 505 | STEPS: |
160 | 493 | 1. Click "Test" and insert a MSP card into the reader. | 506 | 1. Click "Test" and insert a MSP card into the reader. |
161 | 507 | If a file browser opens up, you can safely close it. | ||
162 | 494 | (Note: this test will time-out after 20 seconds.) | 508 | (Note: this test will time-out after 20 seconds.) |
164 | 495 | 2. Do not unplug the device after the test. | 509 | 2. Do not remove the device after this test. |
165 | 496 | VERIFICATION: | 510 | VERIFICATION: |
166 | 497 | The verification of this test is automated. Do not change the | 511 | The verification of this test is automated. Do not change the |
167 | 498 | automatically selected result. | 512 | automatically selected result. |
168 | @@ -531,8 +545,9 @@ | |||
169 | 531 | detect the insertion of a MSP card after the system has been suspended | 545 | detect the insertion of a MSP card after the system has been suspended |
170 | 532 | STEPS: | 546 | STEPS: |
171 | 533 | 1. Click "Test" and insert a MSP card into the reader. | 547 | 1. Click "Test" and insert a MSP card into the reader. |
172 | 548 | If a file browser opens up, you can safely close it. | ||
173 | 534 | (Note: this test will time-out after 20 seconds.) | 549 | (Note: this test will time-out after 20 seconds.) |
175 | 535 | 2. Do not unplug the device after the test. | 550 | 2. Do not remove the device after this test. |
176 | 536 | VERIFICATION: | 551 | VERIFICATION: |
177 | 537 | The verification of this test is automated. Do not change the | 552 | The verification of this test is automated. Do not change the |
178 | 538 | automatically selected result. | 553 | automatically selected result. |
179 | @@ -570,8 +585,9 @@ | |||
180 | 570 | detect the insertion of a Extreme Digital (xD) media card | 585 | detect the insertion of a Extreme Digital (xD) media card |
181 | 571 | STEPS: | 586 | STEPS: |
182 | 572 | 1. Click "Test" and insert a xD card into the reader. | 587 | 1. Click "Test" and insert a xD card into the reader. |
183 | 588 | If a file browser opens up, you can safely close it. | ||
184 | 573 | (Note: this test will time-out after 20 seconds.) | 589 | (Note: this test will time-out after 20 seconds.) |
186 | 574 | 2. Do not unplug the device after the test. | 590 | 2. Do not remove the device after this test. |
187 | 575 | VERIFICATION: | 591 | VERIFICATION: |
188 | 576 | The verification of this test is automated. Do not change the | 592 | The verification of this test is automated. Do not change the |
189 | 577 | automatically selected result. | 593 | automatically selected result. |
190 | @@ -610,8 +626,9 @@ | |||
191 | 610 | detect the insertion of a xD card after the system has been suspended | 626 | detect the insertion of a xD card after the system has been suspended |
192 | 611 | STEPS: | 627 | STEPS: |
193 | 612 | 1. Click "Test" and insert a xD card into the reader. | 628 | 1. Click "Test" and insert a xD card into the reader. |
194 | 629 | If a file browser opens up, you can safely close it. | ||
195 | 613 | (Note: this test will time-out after 20 seconds.) | 630 | (Note: this test will time-out after 20 seconds.) |
197 | 614 | 2. Do not unplug the device after the test. | 631 | 2. Do not remove the device after this test. |
198 | 615 | VERIFICATION: | 632 | VERIFICATION: |
199 | 616 | The verification of this test is automated. Do not change the | 633 | The verification of this test is automated. Do not change the |
200 | 617 | automatically selected result. | 634 | automatically selected result. |
Awesome, thanks!