diff tests/hghave.py @ 30560:94fb0458a791

test-gpg: start gpg-agent under control of the test runner GnuPG v2 automatically starts gpg-agent. We should kill the daemon process.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 14 Aug 2016 17:01:33 +0900
parents 334632380e22
children 7025693433b2
line wrap: on
line diff
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -349,6 +349,10 @@
 def has_gpg():
     return matchoutput('gpg --version 2>&1', br'GnuPG')
 
+@check("gpg2", "gpg client v2")
+def has_gpg2():
+    return matchoutput('gpg --version 2>&1', br'GnuPG[^0-9]+2\.')
+
 @check("unix-permissions", "unix-style permissions")
 def has_unix_permissions():
     d = tempfile.mkdtemp(dir='.', prefix=tempprefix)