Skip to content

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented May 6, 2021

The address tuple for CAN_RAW no longer returns the address family
after the introduction of CAN ISO-TP support in a30f6d4. 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 355bae8)

Co-authored-by: karl ding karlding@users.noreply.github.com

https://bugs.python.org/issue40297

The address tuple for CAN_RAW no longer returns the address family
after the introduction of CAN ISO-TP support in a30f6d4. 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 355bae8)

Co-authored-by: karl ding <karlding@users.noreply.github.com>
@miss-islington
Copy link
Contributor Author

@karlding and @zware: Status check is done, and it's a failure ❌ .

@miss-islington
Copy link
Contributor Author

@karlding and @zware: Status check is done, and it's a success ✅ .

@zware zware requested a review from ambv May 6, 2021 21:01
@miss-islington
Copy link
Contributor Author

@karlding and @zware: Status check is done, and it's a success ✅ .

@ambv
Copy link
Contributor

ambv commented May 7, 2021

Note: while this is not a security bugfix per se, it enables us to use a wider array of buildbots to test 3.8 with, which is indirectly important for security.

@ambv ambv merged commit 8a12f46 into python:3.8 May 7, 2021
@bedevere-bot
Copy link

@ambv: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington miss-islington deleted the backport-355bae8-3.8 branch May 7, 2021 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants