Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pylabrobot/io/usb.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ def get_available_devices(self) -> List["usb.core.Device"]:
continue

if self._serial_number is not None:
if dev._serial_number is None:
# PyUSB reads the serial number descriptor on first access; `_serial_number` is only its
# cache, empty until then.
if dev.iSerialNumber == 0 or dev.serial_number is None:
raise RuntimeError(
f"A serial number was specified for '{self.human_readable_device_name}', but the device does not have a serial number."
)
Expand Down
25 changes: 25 additions & 0 deletions pylabrobot/io/usb_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,3 +189,28 @@ def test_validator_replays_a_write(self) -> None:
]
validator = USBValidator(capture, "mock USB", 1, 2)
self.assertEqual(validator.ctrl_transfer(0x40, 1, 0, 0, b"\x01"), bytearray())


class USBDeviceSelectionTests(unittest.TestCase):
"""Pick a device by serial number, reading the descriptor rather than PyUSB's empty cache."""

def _devices(self, *serials):
devices = []
for serial in serials:
dev = Mock(iSerialNumber=3 if serial else 0, _serial_number=None, serial_number=serial)
devices.append(dev)
return devices

def test_serial_number_is_read_through_the_descriptor(self) -> None:
devices = self._devices("A", "B")
with patch.object(usb_module, "libusb_package", create=True) as lib:
lib.find.return_value = devices
self.assertEqual(
USB(1, 2, "mock USB", serial_number="B").get_available_devices(), [devices[1]]
)

def test_device_without_serial_number_is_refused(self) -> None:
with patch.object(usb_module, "libusb_package", create=True) as lib:
lib.find.return_value = self._devices(None)
with self.assertRaisesRegex(RuntimeError, "does not have a serial number"):
USB(1, 2, "mock USB", serial_number="B").get_available_devices()
Loading