-
Notifications
You must be signed in to change notification settings - Fork 427
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
conda-bot
added
the
cla-signed
[bot] added once the contributor has signed the CLA
label
Nov 10, 2023
mbargull
force-pushed
the
ci-fixes-2023-11
branch
from
November 10, 2023 17:56
d9eb717
to
0d56d11
Compare
pre-commit.ci autofix |
mbargull
force-pushed
the
ci-fixes-2023-11
branch
3 times, most recently
from
November 10, 2023 20:11
70d7d06
to
91ff365
Compare
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>
for more information, see https://pre-commit.ci
mbargull
force-pushed
the
ci-fixes-2023-11
branch
from
November 16, 2023 22:47
91ff365
to
adabc08
Compare
3 tasks
N.B.: There are still some failing tests. Most of those are most likely either
|
jaimergp
previously approved these changes
Nov 17, 2023
There was a problem hiding this 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
.
Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
jezdez
approved these changes
Nov 17, 2023
This was referenced Nov 17, 2023
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 ...
news
directory (using the template) for the next release's release notes?