Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure the tests that use subcommands have access to the system env

Browse Source
This commit is contained in:
Joe Rickerby
2022-07-29 18:48:43 +01:00
parent 3cbe175632
commit 7c95f77524
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_test/environment_test.py
+8 -7
View File
@@ -3,6 +3,7 @@ import sys
from cibuildwheel.environment import parse_environment from cibuildwheel.environment import parse_environment
# this command is equivalent to Unix 'echo', but works on Windows too
PYTHON_ECHO = f"'{sys.executable}' -c \"import sys; print(*sys.argv[1:])\"" PYTHON_ECHO = f"'{sys.executable}' -c \"import sys; print(*sys.argv[1:])\""
@@ -44,9 +45,10 @@ def test_shell_eval():
def test_shell_eval_and_env(): def test_shell_eval_and_env():
environment_recipe = parse_environment(f'VAR="$({PYTHON_ECHO} "$PREV_VAR" string)"') environment_recipe = parse_environment(f'VAR="$({PYTHON_ECHO} "$PREV_VAR" string)"')
environment_dict = environment_recipe.as_dictionary(prev_environment={"PREV_VAR": "1 2 3"}) prev_environment = {**os.environ, "PREV_VAR": "1 2 3"}
environment_dict = environment_recipe.as_dictionary(prev_environment=prev_environment)
assert environment_dict == {"PREV_VAR": "1 2 3", "VAR": "1 2 3 string"} assert environment_dict == {**prev_environment, "VAR": "1 2 3 string"}
def test_empty_var(): def test_empty_var():
@@ -80,8 +82,8 @@ def test_operators_inside_eval():
f'SOMETHING="$({PYTHON_ECHO} a; {PYTHON_ECHO} b; {PYTHON_ECHO} c)"' f'SOMETHING="$({PYTHON_ECHO} a; {PYTHON_ECHO} b; {PYTHON_ECHO} c)"'
) )
# pass the existing process env so PATH is available # pass the existing process env so subcommands can be run in the evaluation
environment_dict = environment_recipe.as_dictionary(os.environ.copy()) environment_dict = environment_recipe.as_dictionary(prev_environment=os.environ.copy())
assert environment_dict.get("SOMETHING") == "a\nb\nc" assert environment_dict.get("SOMETHING") == "a\nb\nc"
@@ -89,7 +91,6 @@ def test_operators_inside_eval():
def test_substitution_with_backslash(): def test_substitution_with_backslash():
environment_recipe = parse_environment('PATH2="somewhere_else;$PATH1"') environment_recipe = parse_environment('PATH2="somewhere_else;$PATH1"')
# pass the existing process env so PATH is available
environment_dict = environment_recipe.as_dictionary(prev_environment={"PATH1": "c:\\folder\\"}) environment_dict = environment_recipe.as_dictionary(prev_environment={"PATH1": "c:\\folder\\"})
assert environment_dict.get("PATH2") == "somewhere_else;c:\\folder\\" assert environment_dict.get("PATH2") == "somewhere_else;c:\\folder\\"
@@ -100,8 +101,8 @@ def test_awkwardly_quoted_variable():
f'VAR2=something"like this""$VAR1"$VAR1$({PYTHON_ECHO} "there is more")"$({PYTHON_ECHO} "and more!")"' f'VAR2=something"like this""$VAR1"$VAR1$({PYTHON_ECHO} "there is more")"$({PYTHON_ECHO} "and more!")"'
) )
# pass the existing process env so PATH is available prev_environment = {**os.environ, "VAR1": "but wait"}
environment_dict = environment_recipe.as_dictionary({"VAR1": "but wait"}) environment_dict = environment_recipe.as_dictionary(prev_environment=prev_environment)
assert ( assert (
environment_dict.get("VAR2") == "somethinglike thisbut waitbut waitthere is moreand more!" environment_dict.get("VAR2") == "somethinglike thisbut waitbut waitthere is moreand more!"