Merge lp:~roadmr/checkbox/1331528-usb3 into lp:checkbox

Proposed by Daniel Manrique on 2014-06-18
Status: Merged
Approved by: Zygmunt Krynicki on 2014-06-18
Approved revision: 3083
Merged at revision: 3085
Proposed branch: lp:~roadmr/checkbox/1331528-usb3
Merge into: lp:checkbox
Diff against target: 43 lines (+4/-4)
2 files modified
providers/plainbox-provider-checkbox/jobs/suspend.txt.in (+2/-2)
providers/plainbox-provider-checkbox/jobs/usb.txt.in (+2/-2)
To merge this branch: bzr merge lp:~roadmr/checkbox/1331528-usb3
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) 2014-06-18 Approve on 2014-06-18
Review via email: mp+223602@code.launchpad.net

Commit message

providers:checkbox: update usb3 testing jobs to use --driver

This is more reliable than checking for a specific threshold.

Description of the change

providers:checkbox: update usb3 testing jobs to use --driver

This is more reliable than checking for a specific threshold.

To post a comment you must log in.
Zygmunt Krynicki (zyga) wrote :

+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/suspend.txt.in'
2--- providers/plainbox-provider-checkbox/jobs/suspend.txt.in 2014-06-17 02:52:25 +0000
3+++ providers/plainbox-provider-checkbox/jobs/suspend.txt.in 2014-06-18 16:04:38 +0000
4@@ -1718,7 +1718,7 @@
5 usb.usb3 == 'supported'
6 depends: suspend/usb3_insert_after_suspend
7 user: root
8-command: removable_storage_test -s 268400000 -m 500000000 -p 7 usb
9+command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
10 _description:
11 This test is automated and executes after the suspend/usb3_insert_after_suspend
12 test is run.
13@@ -1741,7 +1741,7 @@
14 requires:
15 usb.usb3 == 'supported'
16 depends: suspend/suspend_advanced_auto
17-command: removable_storage_test -l usb && removable_storage_test -s 268400000 -m 500000000 -p 7 usb
18+command: removable_storage_test -l usb && removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
19 _description:
20 This is an automated version of usb3/storage-automated and assumes that the
21 server has usb 3.0 storage devices plugged in prior to checkbox execution. It
22
23=== modified file 'providers/plainbox-provider-checkbox/jobs/usb.txt.in'
24--- providers/plainbox-provider-checkbox/jobs/usb.txt.in 2014-05-09 16:53:32 +0000
25+++ providers/plainbox-provider-checkbox/jobs/usb.txt.in 2014-06-18 16:04:38 +0000
26@@ -160,7 +160,7 @@
27 depends: usb3/insert
28 user: root
29 estimated_duration: 45.0
30-command: removable_storage_test -s 268400000 -m 500000000 -p 7 usb
31+command: removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
32 _description:
33 This test is automated and executes after the usb3/insert test is run.
34
35@@ -180,7 +180,7 @@
36 requires:
37 usb.usb3 == 'supported'
38 estimated_duration: 45.0
39-command: removable_storage_test -l usb && removable_storage_test -s 268400000 -m 500000000 -p 7 usb
40+command: removable_storage_test -l usb && removable_storage_test -s 268400000 -m 500000000 usb --driver xhci_hcd
41 _description:
42 This is an automated version of usb3/storage-automated and assumes that the
43 server has usb 3.0 storage devices plugged in prior to checkbox execution. It

Subscribers

People subscribed via source and target branches