diff options
| author | Jannis Leidel <jannis@leidel.info> | 2012-09-01 16:19:19 +0200 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2012-09-01 16:19:19 +0200 |
| commit | 235e1dea02abd3a89ab53ea8035fd4ee8a37887b (patch) | |
| tree | 5e7b2c5a853aefed870863bed9da6722100e2420 /tests/git_submodule_helpers.py | |
| parent | 6083597ebebd05d28b57d53c6077bfa7c3b168f8 (diff) | |
| parent | b183a327412e83ac24a9c9d28a6bedd94bb69d7b (diff) | |
| download | pip-threaded-page-getting.tar.gz | |
Merge branch 'develop' into threaded-page-gettingthreaded-page-getting
Diffstat (limited to 'tests/git_submodule_helpers.py')
| -rw-r--r-- | tests/git_submodule_helpers.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/git_submodule_helpers.py b/tests/git_submodule_helpers.py index ef08b2636..ecb789b10 100644 --- a/tests/git_submodule_helpers.py +++ b/tests/git_submodule_helpers.py @@ -44,19 +44,22 @@ def _create_test_package_with_submodule(env): packages=find_packages(), ) '''), version_pkg_path) - env.run('git', 'init', cwd=version_pkg_path) - env.run('git', 'add', '.', cwd=version_pkg_path) + env.run('git', 'init', cwd=version_pkg_path, expect_error=True) + env.run('git', 'add', '.', cwd=version_pkg_path, expect_error=True) env.run('git', 'commit', '-q', '--author', 'Pip <python-virtualenv@googlegroups.com>', - '-am', 'initial version', cwd=version_pkg_path) + '-am', 'initial version', cwd=version_pkg_path, + expect_error=True) submodule_path = _create_test_package_submodule(env) - env.run('git', 'submodule', 'add', submodule_path, 'testpkg/static', cwd=version_pkg_path) + env.run('git', 'submodule', 'add', submodule_path, 'testpkg/static', cwd=version_pkg_path, + expect_error=True) env.run('git', 'commit', '-q', '--author', 'Pip <python-virtualenv@googlegroups.com>', - '-am', 'initial version w submodule', cwd=version_pkg_path) + '-am', 'initial version w submodule', cwd=version_pkg_path, + expect_error=True) return version_pkg_path, submodule_path |