Skip to content

Fix new vcs test on Windows #6262

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 29, 2024
Merged

Fix new vcs test on Windows #6262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbcd06c
Fix test on windows
matteius Sep 29, 2024
2651f99
Fix tests for windows and leave behavior for mac/linux
matteius Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/integration/test_install_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@pytest.mark.install
def test_basic_install(pipenv_instance_private_pypi):
with pipenv_instance_private_pypi() as p:
c = p.pipenv("install six")
c = p.pipenv("install six -v")
assert c.returncode == 0
assert "six" in p.pipfile["packages"]
assert "six" in p.lockfile["default"]
Expand Down
9 changes: 5 additions & 4 deletions tests/integration/test_install_vcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ def test_install_github_vcs_with_credentials(pipenv_instance_pypi, use_credentia
url = "git+https://${GIT_USERNAME}:${GIT_PASSWORD}@${GIT_REPO}@2.16"
else:
url = "git+https://${GIT_REPO}@2.16"

# Use single quotes to prevent shell expansion
c = p.pipenv(f"install '{url}'")
if os.name == 'nt':
c = p.pipenv(f"install {url} -v")
else:
c = p.pipenv(f"install '{url}' -v")
assert c.returncode == 0, f"Install failed with error: {c.stderr}"

assert "dataclass-factory" in p.pipfile["packages"]
Expand All @@ -40,5 +41,5 @@ def test_install_github_vcs_with_credentials(pipenv_instance_pypi, use_credentia
assert "${GIT_PASSWORD}" in lockfile_content['default']['dataclass-factory']['git']

# Verify that the package is installed and usable
c = p.pipenv("run python -c 'import dataclass_factory'")
c = p.pipenv("run python -c \"import dataclass_factory\"")
assert c.returncode == 0, f"Failed to import library: {c.stderr}"
Loading