Merge ~rodsmith/plainbox-provider-checkbox:fix-too-many-ethernet into plainbox-provider-checkbox:master

Proposed by Rod Smith
Status: Merged
Approved by: Rod Smith
Approved revision: b5d00865d82569edfccc8201e870e4cd24bf4791
Merged at revision: e8c2c51f2740db4400f4d23663a85265f992866e
Proposed branch: ~rodsmith/plainbox-provider-checkbox:fix-too-many-ethernet
Merge into: plainbox-provider-checkbox:master
Diff against target: 11 lines (+1/-1)
1 file modified
bin/network_device_info (+1/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+331164@code.launchpad.net

Description of the change

This is a replacement for the buggy merge request https://code.launchpad.net/~rodsmith/checkbox-support/+git/checkbox-support/+merge/331160, for bug #1718749 ("Too many Ethernet devices detected on Cavium Thunder X"). This MR takes a different approach, by modifying network_device_info in plainbox-provider-checkbox rather than udevadm.py in checkbox-support. The latter proved quite tricky, since the change that fixed the bug had side effects that broke several other, completely unrelated, tests (of QEMU KVM, card readers, accelerometers, etc.).

This approach localizes the change much later in the testing process, to the network_device_info test itself, so there's much less risk of side effects affecting non-network devices. This version simply omits devices with device names of "UNKNOWN" from the list of devices reported by udev.

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

safer indeed, thanks for your checkbox-support attempt though. Udev and NM are tricky to compare sometimes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/network_device_info b/bin/network_device_info
2index da2f5a2..174fbe8 100755
3--- a/bin/network_device_info
4+++ b/bin/network_device_info
5@@ -58,7 +58,7 @@ nm_devices = []
6
7 class UdevResult:
8 def addDevice(self, device):
9- if device.category == 'NETWORK':
10+ if device.category == 'NETWORK' and device.interface != "UNKNOWN":
11 udev_devices.append(device)
12
13

Subscribers

People subscribed via source and target branches