aboutsummaryrefslogtreecommitdiff
path: root/unittests/subprojectscommandtests.py
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-09-02 15:20:34 -0400
committerXavier Claessens <xclaesse@gmail.com>2021-09-03 14:14:15 -0400
commit5166a47acb7e7b433f8d86dee7d4dbb86210e42b (patch)
treed79cddff25d466521632c20fe666acb91cea44f6 /unittests/subprojectscommandtests.py
parent604088b5411460208357ac17f6fc565a591564cf (diff)
downloadmeson-5166a47acb7e7b433f8d86dee7d4dbb86210e42b.zip
meson-5166a47acb7e7b433f8d86dee7d4dbb86210e42b.tar.gz
meson-5166a47acb7e7b433f8d86dee7d4dbb86210e42b.tar.bz2
tests: when generating git repositories, make sure that pgpsign is off
I have a local configuration tag.forcesignannotated=true commit.gpgsign=true This causes the tests to fail with e.g. error: gpg failed to sign the data fatal: failed to write commit object Since this is a unittest, it is never wrong to tell git "just ignore prior configuration, and disable all PGP signing".
Diffstat (limited to 'unittests/subprojectscommandtests.py')
-rw-r--r--unittests/subprojectscommandtests.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/unittests/subprojectscommandtests.py b/unittests/subprojectscommandtests.py
index edb8da6..edd6ac1 100644
--- a/unittests/subprojectscommandtests.py
+++ b/unittests/subprojectscommandtests.py
@@ -83,7 +83,7 @@ class SubprojectsCommandTests(BasePlatformTests):
self._git(['init'] + extra_cmd, path)
self._git_config(path)
self._git(['add', '.'], path)
- self._git(['commit', '-m', 'Initial commit'], path)
+ self._git(['commit', '--no-gpg-sign', '-m', 'Initial commit'], path)
def _git_create_remote_repo(self, name):
self._git_create_repo(self.root_dir / name)
@@ -93,15 +93,15 @@ class SubprojectsCommandTests(BasePlatformTests):
def _git_create_remote_commit(self, name, branch):
self._git_remote(['checkout', branch], name)
- self._git_remote(['commit', '--allow-empty', '-m', f'initial {branch} commit'], name)
+ self._git_remote(['commit', '--no-gpg-sign', '--allow-empty', '-m', f'initial {branch} commit'], name)
def _git_create_remote_branch(self, name, branch):
self._git_remote(['checkout', '-b', branch], name)
- self._git_remote(['commit', '--allow-empty', '-m', f'initial {branch} commit'], name)
+ self._git_remote(['commit', '--no-gpg-sign', '--allow-empty', '-m', f'initial {branch} commit'], name)
def _git_create_remote_tag(self, name, tag):
- self._git_remote(['commit', '--allow-empty', '-m', f'tag {tag} commit'], name)
- self._git_remote(['tag', tag], name)
+ self._git_remote(['commit', '--no-gpg-sign', '--allow-empty', '-m', f'tag {tag} commit'], name)
+ self._git_remote(['tag', '--no-sign', tag], name)
def _wrap_create_git(self, name, revision='master'):
path = self.root_dir / name