Skip to content

Fix slcan tests #1834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zariiii9003 merged 1 commit into from
Aug 10, 2024
Merged

Fix slcan tests #1834

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 9 additions & 13 deletions test/test_slcan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import serial

import can
import can.interfaces.slcan

from .config import IS_PYPY

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

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

def test_recv_standard_remote(self):
self.serial.write(b"r1238\r")
Expand All @@ -95,9 +93,8 @@ def test_send_standard_remote(self):
arbitration_id=0x123, is_extended_id=False, is_remote_frame=True, dlc=8
)
self.bus.send(msg)
expected = b"r1238\r"
data = self.serial.read(len(expected))
self.assertEqual(data, expected)
rx_msg = self.bus.recv(TIMEOUT)
self.assertTrue(msg.equals(rx_msg, timestamp_delta=None))

def test_recv_extended_remote(self):
self.serial.write(b"R12ABCDEF6\r")
Expand All @@ -113,9 +110,8 @@ def test_send_extended_remote(self):
arbitration_id=0x12ABCDEF, is_extended_id=True, is_remote_frame=True, dlc=6
)
self.bus.send(msg)
expected = b"R12ABCDEF6\r"
data = self.serial.read(len(expected))
self.assertEqual(data, expected)
rx_msg = self.bus.recv(TIMEOUT)
self.assertTrue(msg.equals(rx_msg, timestamp_delta=None))

def test_partial_recv(self):
self.serial.write(b"T12ABCDEF")
Expand Down