tests: Fix notation tests.
authorJustus Winter <justus@gnupg.org>
Wed, 1 Jun 2016 10:50:32 +0000 (12:50 +0200)
committerJustus Winter <justus@gnupg.org>
Wed, 1 Jun 2016 10:50:32 +0000 (12:50 +0200)
* lang/python/tests/t-sig-notation.py (check_result): Check critical
flag.
* tests/gpg/t-sig-notation.c (check_result): Likewise.

Fixes-commit: 1cacd7d0
Signed-off-by: Justus Winter <justus@gnupg.org>
lang/python/tests/t-sig-notation.py
tests/gpg/t-sig-notation.c

index 2d832ef..cb4a48e 100755 (executable)
@@ -44,9 +44,8 @@ def check_result(result):
             "Expected {!r}, got {!r}".format(value, r.value)
         assert r.human_readable \
             == bool(flags&constants.SIG_NOTATION_HUMAN_READABLE)
-        # xxx notyet
-        #assert r.human_readable \
-        #    == bool(flags&constants.SIG_NOTATION_CRITICAL)
+        assert r.critical \
+            == bool(flags&constants.SIG_NOTATION_CRITICAL)
 
     assert len(expected_notations) == 0
 
index 7345a52..843606a 100644 (file)
@@ -83,11 +83,11 @@ check_result (gpgme_verify_result_t result)
               && r->value
               && !strcmp (r->value, expected_notations[i].value)
               && r->value_len == strlen (expected_notations[i].value)
-              && r->flags
-              == (expected_notations[i].flags & ~GPGME_SIG_NOTATION_CRITICAL)
+              && r->flags == expected_notations[i].flags
               && r->human_readable
               == !!(r->flags & GPGME_SIG_NOTATION_HUMAN_READABLE)
-              && r->critical == 0)
+              && r->critical
+               == !!(r->flags & GPGME_SIG_NOTATION_CRITICAL))
            {
              expected_notations[i].seen++;
              any++;