[Python-checkins] bpo-40297: Fix test_socket.CANTest.testSendFrame (GH-19548) (#25957)
ambv
webhook-mailer at python.org
Fri May 7 09:54:56 EDT 2021
https://github.com/python/cpython/commit/8a12f46dd8c780de84d78e6dd8350230e52e0c46
commit: 8a12f46dd8c780de84d78e6dd8350230e52e0c46
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-05-07T15:54:42+02:00
summary:
bpo-40297: Fix test_socket.CANTest.testSendFrame (GH-19548) (#25957)
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 at users.noreply.github.com>
files:
M Lib/test/test_socket.py
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index f9370d8e52dca1..eada6e929fe159 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -187,7 +187,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
@@ -1954,7 +1954,6 @@ def testSendFrame(self):
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')
More information about the Python-checkins
mailing list