Skip to content

Commit 30601c7

Browse files
authored
fix slcan tests (#1834)
1 parent 971c331 commit 30601c7

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

test/test_slcan.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import serial
77

8-
import can
8+
import can.interfaces.slcan
99

1010
from .config import IS_PYPY
1111

@@ -58,9 +58,8 @@ def test_send_extended(self):
5858
arbitration_id=0x12ABCDEF, is_extended_id=True, data=[0xAA, 0x55]
5959
)
6060
self.bus.send(msg)
61-
expected = b"T12ABCDEF2AA55\r"
62-
data = self.serial.read(len(expected))
63-
self.assertEqual(data, expected)
61+
rx_msg = self.bus.recv(TIMEOUT)
62+
self.assertTrue(msg.equals(rx_msg, timestamp_delta=None))
6463

6564
def test_recv_standard(self):
6665
self.serial.write(b"t4563112233\r")
@@ -77,9 +76,8 @@ def test_send_standard(self):
7776
arbitration_id=0x456, is_extended_id=False, data=[0x11, 0x22, 0x33]
7877
)
7978
self.bus.send(msg)
80-
expected = b"t4563112233\r"
81-
data = self.serial.read(len(expected))
82-
self.assertEqual(data, expected)
79+
rx_msg = self.bus.recv(TIMEOUT)
80+
self.assertTrue(msg.equals(rx_msg, timestamp_delta=None))
8381

8482
def test_recv_standard_remote(self):
8583
self.serial.write(b"r1238\r")
@@ -95,9 +93,8 @@ def test_send_standard_remote(self):
9593
arbitration_id=0x123, is_extended_id=False, is_remote_frame=True, dlc=8
9694
)
9795
self.bus.send(msg)
98-
expected = b"r1238\r"
99-
data = self.serial.read(len(expected))
100-
self.assertEqual(data, expected)
96+
rx_msg = self.bus.recv(TIMEOUT)
97+
self.assertTrue(msg.equals(rx_msg, timestamp_delta=None))
10198

10299
def test_recv_extended_remote(self):
103100
self.serial.write(b"R12ABCDEF6\r")
@@ -113,9 +110,8 @@ def test_send_extended_remote(self):
113110
arbitration_id=0x12ABCDEF, is_extended_id=True, is_remote_frame=True, dlc=6
114111
)
115112
self.bus.send(msg)
116-
expected = b"R12ABCDEF6\r"
117-
data = self.serial.read(len(expected))
118-
self.assertEqual(data, expected)
113+
rx_msg = self.bus.recv(TIMEOUT)
114+
self.assertTrue(msg.equals(rx_msg, timestamp_delta=None))
119115

120116
def test_partial_recv(self):
121117
self.serial.write(b"T12ABCDEF")

0 commit comments

Comments
 (0)