diff --git a/tests/integration/test_install_uri.py b/tests/integration/test_install_uri.py index 7db10bfb..fd143562 100644 --- a/tests/integration/test_install_uri.py +++ b/tests/integration/test_install_uri.py @@ -34,32 +34,16 @@ def test_basic_vcs_install(PipenvInstance): @pytest.mark.vcs @pytest.mark.install @pytest.mark.needs_internet -def test_git_vcs_install(PipenvInstance): +def test_basic_vcs_install_with_env_var(PipenvInstance): with PipenvInstance(chdir=True) as p: - c = p.pipenv("install git+git://github.com/benjaminp/six.git@1.11.0#egg=six") - assert c.returncode == 0 - assert "six" in p.pipfile["packages"] - assert "git" in p.pipfile["packages"]["six"] - assert p.lockfile["default"]["six"] == { - "git": "git://github.com/benjaminp/six.git", - "ref": "15e31431af97e5e64b80af0a3f598d382bcdd49a", - } - - -@flaky -@pytest.mark.vcs -@pytest.mark.install -@pytest.mark.needs_internet -def test_git_vcs_install_with_env_var(PipenvInstance): - with PipenvInstance(chdir=True) as p: - p._pipfile.add("six", {"git": "git://${GIT_HOST}/benjaminp/six.git", "ref": "1.11.0"}) + p._pipfile.add("six", {"git": "https://${GIT_HOST}/benjaminp/six.git", "ref": "1.11.0"}) os.environ["GIT_HOST"] = "github.com" c = p.pipenv("install") assert c.returncode == 0 assert "six" in p.pipfile["packages"] assert "git" in p.pipfile["packages"]["six"] assert p.lockfile["default"]["six"] == { - "git": "git://${GIT_HOST}/benjaminp/six.git", + "git": "https://${GIT_HOST}/benjaminp/six.git", "ref": "15e31431af97e5e64b80af0a3f598d382bcdd49a", } diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 9139c8c3..f2514c2e 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -17,16 +17,16 @@ DEP_PIP_PAIRS = [ ( { "pinax": { - "git": "git://github.com/pinax/pinax.git", + "git": "https://github.com/pinax/pinax.git", "ref": "1.4", "editable": True, } }, - "-e git+git://github.com/pinax/pinax.git@1.4#egg=pinax", + "-e git+https://github.com/pinax/pinax.git@1.4#egg=pinax", ), ( - {"pinax": {"git": "git://github.com/pinax/pinax.git", "ref": "1.4"}}, - "git+git://github.com/pinax/pinax.git@1.4#egg=pinax", + {"pinax": {"git": "https://github.com/pinax/pinax.git", "ref": "1.4"}}, + "git+https://github.com/pinax/pinax.git@1.4#egg=pinax", ), ( # Mercurial. {