Skip to content

Commit 6d16fa4

Browse files
committed
Use git in place of svn for tests
1 parent e1d489f commit 6d16fa4

File tree

4 files changed

+16
-28
lines changed

4 files changed

+16
-28
lines changed

news/559bb022-21ae-498c-a2ce-2c354d880f5e.trivial

Whitespace-only changes.

tests/functional/test_install_reqs.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
_create_test_package_with_subdirectory,
99
create_basic_sdist_for_package,
1010
create_basic_wheel_for_package,
11-
need_svn,
1211
path_to_url,
1312
requirements_file,
1413
)
@@ -160,7 +159,6 @@ def test_relative_requirements_file(
160159

161160

162161
@pytest.mark.network
163-
@need_svn
164162
def test_multiple_requirements_files(script, tmpdir, with_wheel):
165163
"""
166164
Test installing from multiple nested requirements files.
@@ -169,11 +167,10 @@ def test_multiple_requirements_files(script, tmpdir, with_wheel):
169167
other_lib_name, other_lib_version = 'anyjson', '0.3'
170168
script.scratch_path.joinpath("initools-req.txt").write_text(
171169
textwrap.dedent("""
172-
-e {}@10#egg=INITools
170+
-e {}@master#egg=INITools
173171
-r {}-req.txt
174-
""").format
175-
(
176-
local_checkout('svn+http://svn.colorstudy.com/INITools', tmpdir),
172+
""").format(
173+
local_checkout('git+https://github.com/ianb/initools', tmpdir),
177174
other_lib_name
178175
),
179176
)

tests/functional/test_install_user.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import pytest
88

99
from tests.lib import pyversion # noqa: F401
10-
from tests.lib import need_svn
1110
from tests.lib.local_repos import local_checkout
1211

1312

@@ -46,9 +45,8 @@ def test_reset_env_system_site_packages_usersite(self, script):
4645
assert 'INITools' == project_name, project_name
4746

4847
@pytest.mark.network
49-
@need_svn
5048
@pytest.mark.incompatible_with_test_venv
51-
def test_install_subversion_usersite_editable_with_distribute(
49+
def test_install_git_usersite_editable_with_distribute(
5250
self, script, tmpdir):
5351
"""
5452
Test installing current directory ('.') into usersite after installing
@@ -58,7 +56,8 @@ def test_install_subversion_usersite_editable_with_distribute(
5856
'install', '--user', '-e',
5957
'{checkout}#egg=initools'.format(
6058
checkout=local_checkout(
61-
'svn+http://svn.colorstudy.com/INITools', tmpdir)
59+
'git+https://github.com/ianb/initools', tmpdir,
60+
)
6261
)
6362
)
6463
result.assert_installed('INITools', use_user_site=True)

tests/functional/test_uninstall.py

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313

1414
from pip._internal.req.constructors import install_req_from_line
1515
from pip._internal.utils.misc import rmtree
16-
from tests.lib import (
17-
assert_all_changes,
18-
create_test_package_with_setup,
19-
need_svn,
20-
)
16+
from tests.lib import assert_all_changes, create_test_package_with_setup
2117
from tests.lib.local_repos import local_checkout, local_repo
2218

2319

@@ -308,16 +304,16 @@ def test_uninstall_easy_installed_console_scripts(script):
308304

309305

310306
@pytest.mark.network
311-
@need_svn
312-
def test_uninstall_editable_from_svn(script, tmpdir):
307+
def test_uninstall_editable_from_git(script, tmpdir):
313308
"""
314-
Test uninstalling an editable installation from svn.
309+
Test uninstalling an editable installation from git.
315310
"""
316311
result = script.pip(
317312
'install', '-e',
318313
'{checkout}#egg=initools'.format(
319314
checkout=local_checkout(
320-
'svn+http://svn.colorstudy.com/INITools', tmpdir)
315+
'git+https://github.com/ianb/initools', tmpdir,
316+
)
321317
),
322318
)
323319
result.assert_installed('INITools')
@@ -373,21 +369,17 @@ def _test_uninstall_editable_with_source_outside_venv(
373369

374370

375371
@pytest.mark.network
376-
@need_svn
377372
def test_uninstall_from_reqs_file(script, tmpdir):
378-
"""
379-
Test uninstall from a requirements file.
380-
381-
"""
382-
local_svn_url = local_checkout(
383-
'svn+http://svn.colorstudy.com/INITools', tmpdir,
373+
"""Test uninstall from a requirements file."""
374+
local_git_url = local_checkout(
375+
'git+https://github.com/ianb/initools', tmpdir,
384376
)
385377
script.scratch_path.joinpath("test-req.txt").write_text(
386378
textwrap.dedent("""
387379
-e {url}#egg=initools
388380
# and something else to test out:
389381
PyLogo<0.4
390-
""").format(url=local_svn_url)
382+
""").format(url=local_git_url)
391383
)
392384
result = script.pip('install', '-r', 'test-req.txt')
393385
script.scratch_path.joinpath("test-req.txt").write_text(
@@ -400,7 +392,7 @@ def test_uninstall_from_reqs_file(script, tmpdir):
400392
-e {url}#egg=initools
401393
# and something else to test out:
402394
PyLogo<0.4
403-
""").format(url=local_svn_url)
395+
""").format(url=local_git_url)
404396
)
405397
result2 = script.pip('uninstall', '-r', 'test-req.txt', '-y')
406398
assert_all_changes(

0 commit comments

Comments
 (0)