Checkbox

Merge lp://qastaging/~bladernr/checkbox/fix-usb-firewire-tests into lp://qastaging/checkbox

fix-usb-firewire-tests
Merge into trunk

Proposed by Jeff Lane  on 2012-01-19

Status:

Merged

Merged at revision:

1182

Proposed branch:

lp://qastaging/~bladernr/checkbox/fix-usb-firewire-tests

Merge into:

lp://qastaging/checkbox

Diff against target:

324 lines (+106/-70) (has conflicts)

5 files modified

debian/changelog (+7/-1)
jobs/firewire.txt.in (+3/-4)
jobs/suspend.txt.in (+0/-13)
jobs/usb.txt.in (+32/-2)
scripts/removable_storage_test (+64/-50)

Text conflict in jobs/usb.txt.in

To merge this branch:

bzr merge lp://qastaging/~bladernr/checkbox/fix-usb-firewire-tests

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Brendan Donegan (community)		Approve on 2012-01-19
Ara Pulido (community)	2012-01-19	Needs Fixing on 2012-01-19
Review via email: mp+89185@code.qastaging.launchpad.net

Description of the change

Fixed the issue with non-writeable filesystems
Modified usb_test to handle firewire as well, renamed script to removable_storage_test
Modified jobs that referenced usb_test so they now reference removable_storage_test
Modified usb/insert and usb/remove jobs so that they depend on usb/storage-transfer like so:

usb/insert -> usb/storage-transfer -> usb/remove

lp://qastaging/~bladernr/checkbox/fix-usb-firewire-tests updated on 2012-01-19

1181. By Jeff Lane  on 2012-01-19: Removed the usb_storage_after_suspend jobs since all usb tests run after suspend anyway.

Revision history for this message

Ara Pulido (ara) wrote on 2012-01-19:

There are some merge conflicts in the diff.

Also, the USB tests need to be fixed. The 10 or 15 seconds stuff is confusing to most of the users.

review: Needs Fixing

Revision history for this message

Brendan Donegan (brendan-donegan) wrote on 2012-01-19:

The conflict was because I commited a branch with the same changes in the usb job file earlier this week. I just cleaned it up in trunk. I think we need to address separately the issue of a time limit being placed on the driver insertion/removal - which can be confusing. However I think this branch is enough of an advancement that these issues can be dealt with separately.

review: Approve