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.

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

Fix testing config monkeypatch for concurrent test flakiness #5068

Merged
merged 7 commits into from
Nov 17, 2023

Conversation

mbargull
Copy link
Member

@mbargull mbargull commented Nov 10, 2023

The default_testing_config monkeypatching fixture was added in gh-4653 but did not consider "from .config import get_or_merge_config" cases in which get_or_merge_config is already bound and thus not patched.

Description

I noticed flaky tests again in gh-5066.
This is essentially a follow-up to gh-4653 (... about a year later....).

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Nov 10, 2023
@mbargull
Copy link
Member Author

pre-commit.ci autofix

@mbargull mbargull force-pushed the ci-fixes-2023-11 branch 3 times, most recently from 70d7d06 to 91ff365 Compare November 10, 2023 20:11
mbargull and others added 6 commits November 16, 2023 23:47
The default_testing_config monkeypatching fixture was added in condagh-4653
but did not consider "from .config import get_or_merge_config" cases in
which get_or_merge_config is already bound and thus not patched.

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
Helps tests with default_testing_config monkeypatch.

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
Otherwise default values set for testing_config before, e.g.,
environment variable-dependent config can be set in the tests.

Example: tests/cli/test_main_build.py::test_conda_py_no_period failed
since it sets CONDA_PY=36 but testing_config already had set it before.

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
@mbargull mbargull marked this pull request as ready for review November 16, 2023 22:47
@mbargull
Copy link
Member Author

N.B.: There are still some failing tests. Most of those are most likely either

jaimergp
jaimergp previously approved these changes Nov 17, 2023
Copy link
Contributor

@jaimergp jaimergp left a comment

Choose a reason for hiding this comment

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

LGTM. Just one question about the new _function.

conda_build/config.py Show resolved Hide resolved
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
@kenodegard kenodegard merged commit b2b7ab3 into conda:main Nov 17, 2023
20 of 24 checks passed
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Nov 17, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants