Skip to content

Commit d75c5f0

Browse files
Make node scanner tests more deterministic (#526)
This fixes up the tests added with #517 (commit d1c28e5).
1 parent d1c28e5 commit d75c5f0

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

test/test_network.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,23 +321,28 @@ def test_scanner_search_no_network(self):
321321
self.scanner.search()
322322

323323
def test_scanner_search(self):
324-
bus = can.Bus(interface="virtual", receive_own_messages=True)
325-
net = canopen.Network(bus)
324+
rxbus = can.Bus(interface="virtual")
325+
self.addCleanup(rxbus.shutdown)
326+
327+
txbus = can.Bus(interface="virtual")
328+
self.addCleanup(txbus.shutdown)
329+
330+
net = canopen.Network(txbus)
326331
net.connect()
327332
self.addCleanup(net.disconnect)
328333

329334
self.scanner.network = net
330335
self.scanner.search()
331336

332337
payload = bytes([64, 0, 16, 0, 0, 0, 0, 0])
333-
acc = [bus.recv(self.TIMEOUT) for _ in range(127)]
338+
acc = [rxbus.recv(self.TIMEOUT) for _ in range(127)]
334339
for node_id, msg in enumerate(acc, start=1):
335340
with self.subTest(node_id=node_id):
336341
self.assertIsNotNone(msg)
337342
self.assertEqual(msg.arbitration_id, 0x600 + node_id)
338343
self.assertEqual(msg.data, payload)
339344
# Check that no spurious packets were sent.
340-
self.assertIsNone(bus.recv(self.TIMEOUT))
345+
self.assertIsNone(rxbus.recv(self.TIMEOUT))
341346

342347
def test_scanner_search_limit(self):
343348
bus = can.Bus(interface="virtual", receive_own_messages=True)

0 commit comments

Comments
 (0)