From c88c9ef384b6f7bda9a61b58f26c2f89ae25f684 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 1 Jun 2016 12:50:32 +0200 Subject: [PATCH] tests: Fix notation tests. * 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 --- lang/python/tests/t-sig-notation.py | 5 ++--- tests/gpg/t-sig-notation.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lang/python/tests/t-sig-notation.py b/lang/python/tests/t-sig-notation.py index 2d832ef2..cb4a48e3 100755 --- a/lang/python/tests/t-sig-notation.py +++ b/lang/python/tests/t-sig-notation.py @@ -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 diff --git a/tests/gpg/t-sig-notation.c b/tests/gpg/t-sig-notation.c index 7345a523..843606a5 100644 --- a/tests/gpg/t-sig-notation.c +++ b/tests/gpg/t-sig-notation.c @@ -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++;