[Pkg-gnupg-commit] [gpgme] 103/132: python: Skip tests if GnuPG is too old.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Apr 26 01:01:35 UTC 2017


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gpgme.

commit e1cf8bab319ba1dea41ba5d711dbb66ffd8e6fd6
Author: Justus Winter <justus at g10code.com>
Date:   Mon Mar 20 16:00:13 2017 +0100

    python: Skip tests if GnuPG is too old.
    
    * lang/python/tests/support.py (assert_gpg_version): New function.
    * lang/python/tests/t-callbacks.py: Use the new function to skip the
    test if GnuPG is too old.
    * lang/python/tests/t-edit.py: Likewise.
    * lang/python/tests/t-encrypt-sym.py: Likewise.
    * lang/python/tests/t-quick-key-creation.py: Likewise.
    * lang/python/tests/t-quick-key-manipulation.py: Likewise.
    * lang/python/tests/t-quick-key-signing.py: Likewise.
    
    GnuPG-bug-id: 3008
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 lang/python/tests/support.py                  | 7 +++++++
 lang/python/tests/t-callbacks.py              | 2 ++
 lang/python/tests/t-edit.py                   | 2 ++
 lang/python/tests/t-encrypt-sym.py            | 2 ++
 lang/python/tests/t-quick-key-creation.py     | 1 +
 lang/python/tests/t-quick-key-manipulation.py | 1 +
 lang/python/tests/t-quick-key-signing.py      | 1 +
 7 files changed, 16 insertions(+)

diff --git a/lang/python/tests/support.py b/lang/python/tests/support.py
index 80c3a4b..8f9d645 100644
--- a/lang/python/tests/support.py
+++ b/lang/python/tests/support.py
@@ -26,6 +26,13 @@ import tempfile
 import time
 import gpg
 
+def assert_gpg_version(version=(2, 1, 0)):
+    with gpg.Context() as c:
+        if tuple(map(int, c.engine_info.version.split('.'))) < version:
+            print("GnuPG too old: have {0}, need {1}.".format(
+                c.engine_info.version, '.'.join(version)))
+            sys.exit(77)
+
 # known keys
 alpha = "A0FF4590BB6122EDEF6E3C542D727CC768697734"
 bob = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index ae15787..94cf11e 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -24,6 +24,8 @@ import os
 import gpg
 import support
 
+support.assert_gpg_version()
+
 c = gpg.Context()
 c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK)
 
diff --git a/lang/python/tests/t-edit.py b/lang/python/tests/t-edit.py
index 7ac3626..ffc3296 100755
--- a/lang/python/tests/t-edit.py
+++ b/lang/python/tests/t-edit.py
@@ -26,6 +26,8 @@ import os
 import gpg
 import support
 
+support.assert_gpg_version()
+
 class KeyEditor(object):
     def __init__(self):
         self.steps = ["fpr", "expire", "1", "primary", "quit"]
diff --git a/lang/python/tests/t-encrypt-sym.py b/lang/python/tests/t-encrypt-sym.py
index c15955a..8ee9cd6 100755
--- a/lang/python/tests/t-encrypt-sym.py
+++ b/lang/python/tests/t-encrypt-sym.py
@@ -24,6 +24,8 @@ import os
 import gpg
 import support
 
+support.assert_gpg_version()
+
 for passphrase in ("abc", b"abc"):
     c = gpg.Context()
     c.set_armor(True)
diff --git a/lang/python/tests/t-quick-key-creation.py b/lang/python/tests/t-quick-key-creation.py
index c642c5b..8b7372e 100755
--- a/lang/python/tests/t-quick-key-creation.py
+++ b/lang/python/tests/t-quick-key-creation.py
@@ -25,6 +25,7 @@ import itertools
 import time
 
 import support
+support.assert_gpg_version((2, 1, 2))
 
 alpha = "Alpha <alpha at invalid.example.net>"
 
diff --git a/lang/python/tests/t-quick-key-manipulation.py b/lang/python/tests/t-quick-key-manipulation.py
index 45e4c0e..0f47006 100755
--- a/lang/python/tests/t-quick-key-manipulation.py
+++ b/lang/python/tests/t-quick-key-manipulation.py
@@ -24,6 +24,7 @@ import os
 import gpg
 
 import support
+support.assert_gpg_version((2, 1, 14))
 
 alpha = "Alpha <alpha at invalid.example.net>"
 bravo = "Bravo <bravo at invalid.example.net>"
diff --git a/lang/python/tests/t-quick-key-signing.py b/lang/python/tests/t-quick-key-signing.py
index f9778a3..3d648c5 100755
--- a/lang/python/tests/t-quick-key-signing.py
+++ b/lang/python/tests/t-quick-key-signing.py
@@ -25,6 +25,7 @@ import itertools
 import time
 
 import support
+support.assert_gpg_version((2, 1, 1))
 
 with support.EphemeralContext() as ctx:
     uid_counter = 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git



More information about the Pkg-gnupg-commit mailing list