Don't fail if GPG signing is configured by default. All references.

tests/commands/autoupdate_test.py

@@ -21,6 +21,7 @@ from testing.fixtures import make_config_from_repo
 from testing.fixtures import make_repo
 from testing.fixtures import write_config
 from testing.util import get_resource_path
+from testing.util import git_commit
 
 
 @pytest.fixture
@@ -59,11 +60,11 @@ def test_autoupdate_old_revision_broken(tempdir_factory, in_tmpdir, store):
     config = make_config_from_repo(path, check=False)
 
     cmd_output('git', 'mv', C.MANIFEST_FILE, 'nope.yaml', cwd=path)
-    cmd_output('git', 'commit', '-m', 'simulate old repo', cwd=path)
+    git_commit('simulate old repo', cwd=path)
     # Assume this is the revision the user's old repository was at
     rev = git.head_rev(path)
     cmd_output('git', 'mv', 'nope.yaml', C.MANIFEST_FILE, cwd=path)
-    cmd_output('git', 'commit', '-m', 'move hooks file', cwd=path)
+    git_commit('move hooks file', cwd=path)
     update_rev = git.head_rev(path)
 
     config['rev'] = rev
@@ -84,7 +85,7 @@ def out_of_date_repo(tempdir_factory):
     original_rev = git.head_rev(path)
 
     # Make a commit
-    cmd_output('git', 'commit', '--allow-empty', '-m', 'foo', cwd=path)
+    git_commit('foo', cwd=path)
     head_rev = git.head_rev(path)
 
     yield auto_namedtuple(
@@ -239,7 +240,7 @@ def test_autoupdate_tagged_repo(tagged_repo, in_tmpdir, store):
 
 @pytest.fixture
 def tagged_repo_with_more_commits(tagged_repo):
-    cmd_output('git', 'commit', '--allow-empty', '-mfoo', cwd=tagged_repo.path)
+    git_commit('foo', cwd=tagged_repo.path)
     yield tagged_repo
 
 
@@ -263,7 +264,7 @@ def test_autoupdate_latest_no_config(out_of_date_repo, in_tmpdir, store):
     write_config('.', config)
 
     cmd_output('git', '-C', out_of_date_repo.path, 'rm', '-r', ':/')
-    cmd_output('git', '-C', out_of_date_repo.path, 'commit', '-m', 'rm')
+    git_commit('rm', config=out_of_date_repo.path)
 
     ret = autoupdate(C.CONFIG_FILE, store, tags_only=False)
     assert ret == 1
@@ -281,7 +282,7 @@ def hook_disappearing_repo(tempdir_factory):
         os.path.join(path, C.MANIFEST_FILE),
     )
     cmd_output('git', 'add', '.', cwd=path)
-    cmd_output('git', 'commit', '-m', 'Remove foo', cwd=path)
+    git_commit('Remove foo', cwd=path)
 
     yield auto_namedtuple(path=path, original_rev=original_rev)
 

tests/commands/install_uninstall_test.py

@@ -28,6 +28,7 @@ from testing.fixtures import make_consuming_repo
 from testing.fixtures import remove_config_from_repo
 from testing.util import cmd_output_mocked_pre_commit_home
 from testing.util import cwd
+from testing.util import git_commit
 from testing.util import xfailif_no_symlink
 
 
@@ -109,7 +110,7 @@ def _get_commit_output(tempdir_factory, touch_file='foo', **kwargs):
     open(touch_file, 'a').close()
     cmd_output('git', 'add', touch_file)
     return cmd_output_mocked_pre_commit_home(
-        'git', 'commit', '-am', commit_msg, '--allow-empty',
+        'git', 'commit', '-am', commit_msg, '--allow-empty', '--no-gpg-sign',
         # git commit puts pre-commit to stderr
         stderr=subprocess.STDOUT,
         retcode=None,
@@ -151,7 +152,7 @@ def test_install_pre_commit_and_run_custom_path(tempdir_factory, store):
     path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
     with cwd(path):
         cmd_output('git', 'mv', C.CONFIG_FILE, 'custom-config.yaml')
-        cmd_output('git', 'commit', '-m', 'move pre-commit config')
+        git_commit('move pre-commit config')
         assert install('custom-config.yaml', store) == 0
 
         ret, output = _get_commit_output(tempdir_factory)
@@ -163,7 +164,7 @@ def test_install_in_submodule_and_run(tempdir_factory, store):
     src_path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
     parent_path = git_dir(tempdir_factory)
     cmd_output('git', 'submodule', 'add', src_path, 'sub', cwd=parent_path)
-    cmd_output('git', 'commit', '-m', 'foo', cwd=parent_path)
+    git_commit('foo', cwd=parent_path)
 
     sub_pth = os.path.join(parent_path, 'sub')
     with cwd(sub_pth):
@@ -193,7 +194,7 @@ def test_commit_am(tempdir_factory, store):
         # Make an unstaged change
         open('unstaged', 'w').close()
         cmd_output('git', 'add', '.')
-        cmd_output('git', 'commit', '-m', 'foo')
+        git_commit('foo')
         with io.open('unstaged', 'w') as foo_file:
             foo_file.write('Oh hai')
 
@@ -208,12 +209,12 @@ def test_unicode_merge_commit_message(tempdir_factory, store):
     with cwd(path):
         assert install(C.CONFIG_FILE, store) == 0
         cmd_output('git', 'checkout', 'master', '-b', 'foo')
-        cmd_output('git', 'commit', '--allow-empty', '-n', '-m', 'branch2')
+        git_commit('branch2', '-n')
         cmd_output('git', 'checkout', 'master')
         cmd_output('git', 'merge', 'foo', '--no-ff', '--no-commit', '-m', '☃')
         # Used to crash
         cmd_output_mocked_pre_commit_home(
-            'git', 'commit', '--no-edit',
+            'git', 'commit', '--no-edit', '--no-gpg-sign',
             tempdir_factory=tempdir_factory,
         )
 
@@ -246,8 +247,8 @@ def test_environment_not_sourced(tempdir_factory, store):
 
         # Use a specific homedir to ignore --user installs
         homedir = tempdir_factory.get()
-        ret, stdout, stderr = cmd_output(
-            'git', 'commit', '--allow-empty', '-m', 'foo',
+        ret, stdout, stderr = git_commit(
+            'foo',
             env={
                 'HOME': homedir,
                 'PATH': _path_without_us(),

tests/commands/run_test.py

@@ -479,7 +479,7 @@ def test_stdout_write_bug_py26(repo_with_failing_hook, store, tempdir_factory):
 
         # Have to use subprocess because pytest monkeypatches sys.stdout
         _, stdout, _ = cmd_output_mocked_pre_commit_home(
-            'git', 'commit', '-m', 'Commit!',
+            'git', 'commit', '-m', 'Commit!', '--no-gpg-sign',
             # git commit puts pre-commit to stderr
             stderr=subprocess.STDOUT,
             retcode=None,
@@ -508,7 +508,7 @@ def test_lots_of_files(store, tempdir_factory):
         install(C.CONFIG_FILE, store)
 
         cmd_output_mocked_pre_commit_home(
-            'git', 'commit', '-m', 'Commit!',
+            'git', 'commit', '-m', 'Commit!', '--no-gpg-sign',
             # git commit puts pre-commit to stderr
             stderr=subprocess.STDOUT,
             tempdir_factory=tempdir_factory,