diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-05-04 14:01:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-04 14:01:42 -0700 |
| commit | 7b4725a210bcfe3dc65f37cbada423cbd1e9f063 (patch) | |
| tree | 847e3ac42c8fd63363ba13e84ba46d5816b96f8a | |
| parent | 5dffd79ee99a57443e02d9322daf03b0a1bc44c1 (diff) | |
| download | cpython-git-7b4725a210bcfe3dc65f37cbada423cbd1e9f063.tar.gz | |
bpo-40297: Fix test_socket.CANTest.testSendFrame (GH-19548)
The address tuple for CAN_RAW no longer returns the address family
after the introduction of CAN ISO-TP support in a30f6d45ac3. However,
updating test_socket.CANTest.testSendFrame was missed as part of the
change, so the test incorrectly attempts to index past the last tuple
item to retrieve the address family.
This removes the now-redundant check for equality against socket.AF_CAN,
as the tuple will not contain the address family.
(cherry picked from commit 355bae88822bee4de6092b63d69c5a5dad393a16)
Co-authored-by: karl ding <karlding@users.noreply.github.com>
| -rwxr-xr-x | Lib/test/test_socket.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 3c45278748..828d1f3dcc 100755 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -224,7 +224,7 @@ class SocketCANTest(unittest.TestCase): the following commands: # modprobe vcan # ip link add dev vcan0 type vcan - # ifconfig vcan0 up + # ip link set up vcan0 """ interface = 'vcan0' bufsize = 128 @@ -2085,7 +2085,6 @@ class CANTest(ThreadedCANSocketTest): cf, addr = self.s.recvfrom(self.bufsize) self.assertEqual(self.cf, cf) self.assertEqual(addr[0], self.interface) - self.assertEqual(addr[1], socket.AF_CAN) def _testSendFrame(self): self.cf = self.build_can_frame(0x00, b'\x01\x02\x03\x04\x05') |