Merge ~bladernr/plainbox-provider-checkbox:1712435-list-all-usb-devices into plainbox-provider-checkbox:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 4e9706be0cb994f04c15a1649738a3a08be394ef
Merged at revision: 184a95e55ca341cb7f8d7b929769039b8d869db6
Proposed branch: ~bladernr/plainbox-provider-checkbox:1712435-list-all-usb-devices
Merge into: plainbox-provider-checkbox:master
Diff against target: 13 lines (+1/-1)
1 file modified
jobs/usb.txt.in (+1/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+329467@code.launchpad.net

Description of the change

Modifies usb/detect to display all USB devices, not just the ones in the first 4 lines of lsusb output.

Also removes the filtering that removed the bus info, so now you can map devices to hubs.

This second bit came about because we ran into an issue in cert where a USB3 device was being attached to a USB2 hub, and thus not being tested properly.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

weird indeed that we had this head -n 4, +1 for the fix. Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/usb.txt.in b/jobs/usb.txt.in
2index 8fa63d7..be80593 100644
3--- a/jobs/usb.txt.in
4+++ b/jobs/usb.txt.in
5@@ -14,7 +14,7 @@ command:
6 if [[ -v SNAP ]]; then
7 lsusb.py -f $SNAP/var/lib/usbutils/usb.ids 2>/dev/null | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
8 else
9- lsusb 2>/dev/null | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
10+ lsusb 2>/dev/null | sort || echo "No USB devices were detected" >&2
11 fi
12 _summary: Display USB devices attached to SUT
13 _description: Detects and shows USB devices attached to this system.

Subscribers

People subscribed via source and target branches