McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Move a hard-coded relative path out of tests/lib.

Browse source
This commit is contained in:
Chris Jerdonek 2018-10-24 03:35:52 -07:00
parent b8ee4a648e
commit 4b0d8a8eb6
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/functional/test_install_vcs_git.py
View file

@ -485,7 +485,9 @@ def test_check_submodule_addition(script):
"""
Submodules are pulled in on install and updated on upgrade.
"""
module_path, submodule_path = _create_test_package_with_submodule(script)
module_path, submodule_path = (
_create_test_package_with_submodule(script, rel_path='testpkg/static')
)
install_result = script.pip(
'install', '-e', 'git+' + module_path + '#egg=version_pkg'
@ -496,7 +498,9 @@ def test_check_submodule_addition(script):
)
_change_test_package_submodule(script, submodule_path)
_pull_in_submodule_changes_to_module(script, module_path)
_pull_in_submodule_changes_to_module(
script, module_path, rel_path='testpkg/static',
)
# expect error because git may write to stderr
update_result = script.pip(

24
tests/lib/git_submodule_helpers.py
View file

@ -26,22 +26,24 @@ def _change_test_package_submodule(env, submodule_path):
'-m', 'submodule change', cwd=submodule_path)
def _pull_in_submodule_changes_to_module(env, module_path):
env.run(
'git',
'pull',
'-q',
'origin',
'master',
cwd=module_path / 'testpkg/static/',
)
def _pull_in_submodule_changes_to_module(env, module_path, rel_path):
"""
Args:
rel_path: the location of the submodule relative to the superproject.
"""
submodule_path = module_path / rel_path
env.run('git', 'pull', '-q', 'origin', 'master', cwd=submodule_path)
# Pass -a to stage the submodule changes that were just pulled in.
env.run('git', 'commit', '-q',
'--author', 'pip <pypa-dev@googlegroups.com>',
'-am', 'submodule change', cwd=module_path)
def _create_test_package_with_submodule(env):
def _create_test_package_with_submodule(env, rel_path):
"""
Args:
rel_path: the location of the submodule relative to the superproject.
"""
env.scratch_path.join("version_pkg").mkdir()
version_pkg_path = env.scratch_path / 'version_pkg'
version_pkg_path.join("testpkg").mkdir()
@ -69,7 +71,7 @@ def _create_test_package_with_submodule(env):
'submodule',
'add',
submodule_path,
'testpkg/static',
rel_path,
cwd=version_pkg_path,
expect_error=True,
)