Skip to content

bpo-46425: fix direct invocation of test_contextlib #30681

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

Jump to bottom
Merged
serhiy-storchaka merged 2 commits into from
Jan 21, 2022
Merged

bpo-46425: fix direct invocation of test_contextlib #30681

serhiy-storchaka merged 2 commits into from
Jan 21, 2022

Conversation

@sobolevn
Copy link
Member

@sobolevn sobolevn commented Jan 19, 2022 •
edited
Loading

There was a problem with direct invocation of test_contextlib. The best way to illustrate it is:

» ./python.exe Lib/test/test_contextlib.py
...................................................................................
----------------------------------------------------------------------
Ran 83 tests in 0.046s

OK

But, when a path starts with ./, we have a problem:

» ./python.exe ./Lib/test/test_contextlib.py
............................FFF....................................................
======================================================================
FAIL: test_exception (__main__.TestChdir)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/sobolev/Desktop/cpython/./Lib/test/test_contextlib.py", line 1159, in test_exception
    self.assertEqual(os.getcwd(), target)
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: '/Users/sobolev/Desktop/cpython/Lib/test/data' != '/Users/sobolev/Desktop/cpython/./Lib/test/data'
- /Users/sobolev/Desktop/cpython/Lib/test/data
+ /Users/sobolev/Desktop/cpython/./Lib/test/data
?                                ++


======================================================================
FAIL: test_reentrant (__main__.TestChdir)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/sobolev/Desktop/cpython/./Lib/test/test_contextlib.py", line 1143, in test_reentrant
    self.assertEqual(os.getcwd(), target1)
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: '/Users/sobolev/Desktop/cpython/Lib/test/data' != '/Users/sobolev/Desktop/cpython/./Lib/test/data'
- /Users/sobolev/Desktop/cpython/Lib/test/data
+ /Users/sobolev/Desktop/cpython/./Lib/test/data
?                                ++


======================================================================
FAIL: test_simple (__main__.TestChdir)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/sobolev/Desktop/cpython/./Lib/test/test_contextlib.py", line 1132, in test_simple
    self.assertEqual(os.getcwd(), target)
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: '/Users/sobolev/Desktop/cpython/Lib/test/data' != '/Users/sobolev/Desktop/cpython/./Lib/test/data'
- /Users/sobolev/Desktop/cpython/Lib/test/data
+ /Users/sobolev/Desktop/cpython/./Lib/test/data
?                                ++


----------------------------------------------------------------------
Ran 83 tests in 0.050s

FAILED (failures=3)

When __file__ is normalized - the error is gone. Now we can use both styles to call this module.

https://bugs.python.org/issue46425

CC @corona10 as my mentor.

@sobolevn sobolevn requested a review from 1st1 as a code owner January 19, 2022 07:18
@bedevere-bot bedevere-bot added tests Tests in the Lib/test dir awaiting review labels Jan 19, 2022
serhiy-storchaka
serhiy-storchaka reviewed Jan 19, 2022
View reviewed changes
@serhiy-storchaka serhiy-storchaka merged commit 22f73bd into python:main Jan 21, 2022
@miss-islington
Copy link
Contributor

miss-islington commented Jan 21, 2022

Thanks @sobolevn for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Jan 21, 2022

Sorry, @sobolevn and @serhiy-storchaka, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 22f73bd9f1fc573d5c998f345b66c29f7ca6614d 3.10

@miss-islington
Copy link
Contributor

miss-islington commented Jan 21, 2022

Sorry @sobolevn and @serhiy-storchaka, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 22f73bd9f1fc573d5c998f345b66c29f7ca6614d 3.9

@serhiy-storchaka serhiy-storchaka removed their assignment Jan 21, 2022
@sobolevn
Copy link
Member Author

sobolevn commented Jan 21, 2022

Thank you, @serhiy-storchaka! I will backport them manually.

@sobolevn sobolevn mentioned this pull request Apr 16, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@terryjreedy terryjreedy terryjreedy left review comments

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes

@1st1 1st1 Awaiting requested review from 1st1

Assignees

No one assigned

Labels

skip news tests Tests in the Lib/test dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@sobolevn @miss-islington @serhiy-storchaka @terryjreedy @kumaraditya303 @the-knights-who-say-ni @bedevere-bot