Merge pull request #5916 from cjerdonek/remove-unneeded-commit-options

Simplify some git-commit calls in the test code.
pypa · Nov 6, 2018 · eeee9b8 · eeee9b8
2 parents aa42f14 + e758037
commit eeee9b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py
@@ -518,7 +518,7 @@ def _create_test_package_with_subdirectory(script, subdirectory):
     script.run(
         'git', 'commit', '-q',
         '--author', 'pip <pypa-dev@googlegroups.com>',
-        '-am', 'initial version', cwd=version_pkg_path
+        '-m', 'initial version', cwd=version_pkg_path
     )
 
     return version_pkg_path
@@ -570,7 +570,7 @@ def _vcs_add(script, version_pkg_path, vcs='git'):
         script.run(
             'git', 'commit', '-q',
             '--author', 'pip <pypa-dev@googlegroups.com>',
-            '-am', 'initial version', cwd=version_pkg_path,
+            '-m', 'initial version', cwd=version_pkg_path,
         )
     elif vcs == 'hg':
         script.run('hg', 'init', cwd=version_pkg_path)
@@ -627,11 +627,7 @@ def _change_test_package_version(script, version_pkg_path):
     _create_main_file(
         version_pkg_path, name='version_pkg', output='some different version'
     )
-    script.run(
-        'git', 'clean', '-qfdx',
-        cwd=version_pkg_path,
-        expect_stderr=True,
-    )
+    # Pass -a to stage the change to the main file.
     script.run(
         'git', 'commit', '-q',
         '--author', 'pip <pypa-dev@googlegroups.com>',

diff --git a/tests/lib/git_submodule_helpers.py b/tests/lib/git_submodule_helpers.py
@@ -13,7 +13,7 @@ def _create_test_package_submodule(env):
     env.run('git', 'add', '.', cwd=submodule_path)
     env.run('git', 'commit', '-q',
             '--author', 'pip <pypa-dev@googlegroups.com>',
-            '-am', 'initial version / submodule', cwd=submodule_path)
+            '-m', 'initial version / submodule', cwd=submodule_path)
     return submodule_path
 
 
@@ -23,7 +23,7 @@ def _change_test_package_submodule(env, submodule_path):
     env.run('git', 'add', '.', cwd=submodule_path)
     env.run('git', 'commit', '-q',
             '--author', 'pip <pypa-dev@googlegroups.com>',
-            '-am', 'submodule change', cwd=submodule_path)
+            '-m', 'submodule change', cwd=submodule_path)
 
 
 def _pull_in_submodule_changes_to_module(env, module_path):
@@ -35,6 +35,7 @@ def _pull_in_submodule_changes_to_module(env, module_path):
         'master',
         cwd=module_path / 'testpkg/static/',
     )
+    # 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)
@@ -59,8 +60,7 @@ def _create_test_package_with_submodule(env):
     env.run('git', 'add', '.', cwd=version_pkg_path, expect_error=True)
     env.run('git', 'commit', '-q',
             '--author', 'pip <pypa-dev@googlegroups.com>',
-            '-am', 'initial version', cwd=version_pkg_path,
-            expect_error=True)
+            '-m', 'initial version', cwd=version_pkg_path)
 
     submodule_path = _create_test_package_submodule(env)
 
@@ -75,7 +75,6 @@ def _create_test_package_with_submodule(env):
     )
     env.run('git', 'commit', '-q',
             '--author', 'pip <pypa-dev@googlegroups.com>',
-            '-am', 'initial version w submodule', cwd=version_pkg_path,
-            expect_error=True)
+            '-m', 'initial version w submodule', cwd=version_pkg_path)
 
     return version_pkg_path, submodule_path