Skip to content

Commit e94ccae

Browse files
committed
test_freeze_git_clone: No dep on github.com
1 parent c52d7a1 commit e94ccae

File tree

1 file changed

+9
-37
lines changed

1 file changed

+9
-37
lines changed

tests/functional/test_freeze.py

+9-37
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import sys
22
import re
33
import textwrap
4-
import pytest
54
from doctest import OutputChecker, ELLIPSIS
65

6+
from tests.lib import _create_test_package
77
from tests.lib.local_repos import local_checkout, local_repo
88

99

@@ -100,29 +100,16 @@ def test_freeze_svn(script, tmpdir, data):
100100
_check_output(result, expected)
101101

102102

103-
@pytest.mark.network
104103
def test_freeze_git_clone(script, tmpdir, data):
105104
"""
106105
Test freezing a Git clone.
107106
"""
107+
pkg_version = _create_test_package(script)
108108
result = script.run(
109-
'git',
110-
'clone',
111-
local_repo(
112-
'git+http://github.com/pypa/pip-test-package.git',
113-
tmpdir.join("cache")
114-
),
115-
'pip-test-package',
109+
'git', 'clone', pkg_version, 'pip-test-package',
116110
expect_stderr=True,
117111
)
118112
repo_dir = script.scratch_path / 'pip-test-package'
119-
result = script.run(
120-
'git',
121-
'checkout',
122-
'7d654e66c8fa7149c165ddeffa5b56bc06619458',
123-
cwd=repo_dir,
124-
expect_stderr=True,
125-
)
126113
result = script.run(
127114
'python', 'setup.py', 'develop',
128115
cwd=repo_dir,
@@ -133,39 +120,24 @@ def test_freeze_git_clone(script, tmpdir, data):
133120
"""
134121
Script result: ...pip freeze
135122
-- stdout: --------------------
136-
...-e %s@...#egg=pip_test_package-...
123+
-e git+...#egg=version_pkg-master
137124
...
138-
""" %
139-
local_checkout(
140-
'git+http://github.com/pypa/pip-test-package.git',
141-
tmpdir.join("cache"),
142-
)
125+
"""
143126
).strip()
144127
_check_output(result, expected)
145128

146129
result = script.pip(
147-
'freeze', '-f',
148-
'%s#egg=pip_test_package' %
149-
local_checkout(
150-
'git+http://github.com/pypa/pip-test-package.git',
151-
tmpdir.join("cache"),
152-
),
130+
'freeze', '-f', '%s#egg=pip_test_package' % repo_dir,
153131
expect_stderr=True,
154132
)
155133
expected = textwrap.dedent(
156134
"""
157135
Script result: pip freeze -f %(repo)s#egg=pip_test_package
158136
-- stdout: --------------------
159137
-f %(repo)s#egg=pip_test_package...
160-
-e %(repo)s@...#egg=pip_test_package-0.1.1
138+
-e git+...#egg=version_pkg-master
161139
...
162-
""" %
163-
{
164-
'repo': local_checkout(
165-
'git+http://github.com/pypa/pip-test-package.git',
166-
tmpdir.join("cache"),
167-
),
168-
},
140+
""" % {'repo': repo_dir},
169141
).strip()
170142
_check_output(result, expected)
171143

@@ -188,7 +160,7 @@ def test_freeze_git_clone(script, tmpdir, data):
188160
"""
189161
Script result: ...pip freeze
190162
-- stdout: --------------------
191-
...-e ...@...#egg=pip_test_package-branch_name_with_slash...
163+
...-e ...@...#egg=version_pkg-branch_name_with_slash...
192164
...
193165
"""
194166
).strip()

0 commit comments

Comments
 (0)