提交 4c5573c5 编写于 作者: F fin

remove "git submodule foreach" call for backwards compatibility; expect errors...

remove "git submodule foreach" call for backwards compatibility; expect errors in pip install because old versions of git write senseless things to stderr
上级 65d8b625
......@@ -21,7 +21,7 @@ def _change_test_package_submodule(env, submodule_path):
'-am', 'submodule change', cwd=submodule_path)
def _pull_in_submodule_changes_to_module(env, module_path):
env.run(cwd=module_path, *('git submodule foreach git pull -q origin master'.split(' '))) # this only exists in git > 1.7.3
env.run(cwd=module_path/'testpkg/static/', *('git pull -q origin master'.split(' ')))
env.run('git', 'commit', '-q',
'--author', 'Pip <python-virtualenv@googlegroups.com>',
'-am', 'submodule change', cwd=module_path)
......
......@@ -95,7 +95,7 @@ def test_check_submodule_addition():
_change_test_package_submodule(env, submodule_path)
_pull_in_submodule_changes_to_module(env, module_path)
update_result = run_pip('install', '-e', 'git+'+module_path+'#egg=version_pkg', '--upgrade')
update_result = run_pip('install', '-e', 'git+'+module_path+'#egg=version_pkg', '--upgrade', expect_error=True) # expect error because git writes to stdout in some weird cases
assert env.venv/'src/version-pkg/testpkg/static/testfile2' in update_result.files_created
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册