Skip to content

Commit

Permalink
fix CI
Browse files Browse the repository at this point in the history
Signed-off-by: Bernat Gabor <[email protected]>
  • Loading branch information
gaborbernat committed Apr 7, 2020
1 parent bceed0f commit 1acf833
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ universal = true
markers =
slow
junit_family = xunit2
addopts = --tb=auto -ra --showlocals
addopts = --tb=auto -ra --showlocals -p no:xonsh
env =
PYTHONWARNINGS=ignore:DEPRECATION::pip._internal.cli.base_command
PYTHONIOENCODING=utf-8
2 changes: 1 addition & 1 deletion tests/unit/activation/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def env(self, tmp_path):
# add the current python executable folder to the path so we already have another python on the path
# also keep the path so the shells (fish, bash, etc can be discovered)
env[str("PYTHONIOENCODING")] = str("utf-8")
env[str("PATH")] = os.pathsep.join([dirname(sys.executable)] + env.get(str("PATH"), str("")).split(os.pathsep))
env[str("PATH")] = dirname(sys.executable)
# clear up some environment variables so they don't affect the tests
for key in [k for k in env.keys() if k.startswith(str("_OLD")) or k.startswith(str("VIRTUALENV_"))]:
del env[key]
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/seed/test_boostrap_link_via_app_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


@pytest.mark.slow
@pytest.mark.timeout(timeout=60)
@pytest.mark.timeout(timeout=120)
@pytest.mark.parametrize("copies", [False, True] if fs_supports_symlink() else [True])
def test_seed_link_via_app_data(tmp_path, coverage_env, current_fastest, copies):
current = PythonInfo.current_system()
Expand Down

0 comments on commit 1acf833

Please sign in to comment.