From a423603f80d9eb653ce9c171662db2175d7456f5 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 27 Sep 2016 12:28:38 +0200 Subject: [PATCH] tests: Fix check for gpg versions not reporting the critical flag. * lang/python/tests/t-sig-notation.py: Also blacklist 2.0.x. * tests/gpg/t-sig-notation.c: Likewise. Signed-off-by: Justus Winter --- lang/python/tests/t-sig-notation.py | 1 + tests/gpg/t-sig-notation.c | 1 + 2 files changed, 2 insertions(+) diff --git a/lang/python/tests/t-sig-notation.py b/lang/python/tests/t-sig-notation.py index 777bc0b5..68f9c087 100755 --- a/lang/python/tests/t-sig-notation.py +++ b/lang/python/tests/t-sig-notation.py @@ -36,6 +36,7 @@ expected_notations = { with core.Context() as c: version = c.engine_info.version have_correct_sig_data = not (version.startswith("1.") + version.startswith("2.0.") or version == "2.1.1" or (version.startswith("2.1.1") and version[5] < '3')) diff --git a/tests/gpg/t-sig-notation.c b/tests/gpg/t-sig-notation.c index aee7551f..091a26e5 100644 --- a/tests/gpg/t-sig-notation.c +++ b/tests/gpg/t-sig-notation.c @@ -151,6 +151,7 @@ main (int argc, char *argv[]) correctly. */ have_correct_sig_data = ! (strncmp ("1.", engine_info->version, 2) == 0 + || strncmp ("2.0.", version, 4) == 0 || (strncmp ("2.1.1", engine_info->version, 5) == 0 && (engine_info->version[5] == 0 || engine_info->version[5] < '3')));