Skip to content
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

Added an environment variable which helps to check if a code is running from within a pytest run, Fixes #9502 #12190

Merged
merged 9 commits into from
Apr 18, 2024
Merged

Added an environment variable which helps to check if a code is running from within a pytest run, Fixes #9502 #12190

merged 9 commits into from
Apr 18, 2024

Conversation

dheerajck
Copy link
Contributor

No description provided.

@dheerajck dheerajck mentioned this pull request Apr 6, 2024
Merged
nicoddemus
nicoddemus requested changes Apr 6, 2024
View reviewed changes
Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @dheerajck!

Please see my suggestions.

changelog/9502.improvement.rst Outdated Show resolved Hide resolved
testing/test_runner.py Outdated Show resolved Hide resolved
testing/test_runner.py Outdated Show resolved Hide resolved
testing/test_runner.py Outdated Show resolved Hide resolved
@dheerajck @nicoddemus
Apply suggestions from code review
237ea1a 
Co-authored-by: Bruno Oliveira <bruno@soliv.dev>
@dheerajck dheerajck requested a review from nicoddemus April 7, 2024 13:18
@dheerajck
Copy link
Contributor Author

also can I ask why was a ut failing before the latest commit but not right now

nicoddemus
nicoddemus requested changes Apr 7, 2024
View reviewed changes
Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my suggestion to preserve the original PYTEST_VERSION, so pytester.runpytest() is more robust.

src/_pytest/config/__init__.py Show resolved Hide resolved
src/_pytest/config/__init__.py Outdated Show resolved Hide resolved
testing/test_runner.py Outdated Show resolved Hide resolved
@dheerajck @nicoddemus
Cleaning up, if there was a value set for PYTEST_VERSION before pytes…
2f8e436 
…t run by the calling process, we set it back after pytest run

Co-authored-by: Bruno Oliveira <bruno@soliv.dev>
@dheerajck dheerajck requested a review from nicoddemus April 9, 2024 14:20
@dheerajck
Copy link
Contributor Author

Do we need any more changes

@dheerajck
Copy link
Contributor Author

@nicoddemus

nicoddemus
nicoddemus approved these changes Apr 18, 2024
View reviewed changes
Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

src/_pytest/config/__init__.py Outdated Show resolved Hide resolved
@nicoddemus nicoddemus merged commit 48b6d18 into pytest-dev:main Apr 18, 2024
22 of 24 checks passed
@nicoddemus nicoddemus mentioned this pull request Apr 18, 2024
Closed
adamchainz
adamchainz reviewed Apr 18, 2024
View reviewed changes
Copy link
Member

@adamchainz adamchainz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much. This is a clean approach and may have other use cases.

testing/test_runner.py Show resolved Hide resolved
@dheerajck dheerajck mentioned this pull request Apr 18, 2024
Merged
nicoddemus pushed a commit that referenced this pull request Apr 19, 2024
@dheerajck
Use monkeypatch in test_pytest_version_env_var
ad95d59 
Follow up to #12190
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nicoddemus nicoddemus nicoddemus approved these changes

@adamchainz adamchainz adamchainz left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dheerajck @adamchainz @nicoddemus