Fix CMD.exe activation test #13159
Merged
Fix CMD.exe activation test #13159
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
kenodegard
commented
Sep 28, 2023
| self.expect(".*\n") | ||
| else: | ||
| self.expect("%s\n" % value) | ||
| self.expect(f"{value}\r?\n") |
There was a problem hiding this comment.
Auto-handle \r\n and \n.
kenodegard
commented
Sep 28, 2023
| prefix, charizard, _ = shell_wrapper_integration | ||
| conda_bat = Path(CONDA_PACKAGE_ROOT, "shell", "condabin", "conda.bat") | ||
| monkeypatch.setenv("PATH", STRIPPED_PATH) |
There was a problem hiding this comment.
monkeypatch.setenv instead of env_vars
There was a problem hiding this comment.
Don't we use conda env_vars because it resets the context? Will that be a problem compared to monkeypatch?
There was a problem hiding this comment.
I've been trying to move away from env_var(s)? in general
In this case resetting the context has no impact since the context doesn't do anything with PATH
jezdez
approved these changes
Sep 28, 2023
beeankha
approved these changes
Sep 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Looks like git moved on the GitHub runner (?) (or perhaps it changed on conda-forge?) so the CMD.exe test started to fail. Fixed the issue by being more careful with how we "reset" the
PATHfor the CMD.exe test.Merging this to the 23.9.x release branch since we need this fix in order to merge #13155 (we will also need this fix for any 23.9.x patches and the upcoming 23.10.x special release).
Checklist - did you ...
Add a file to thenewsdirectory (using the template) for the next release's release notes?Add / update necessary tests?Add / update outdated documentation?