[git] GPGME - branch, master, updated. gpgme-1.6.0-150-gc88c9ef

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  c88c9ef384b6f7bda9a61b58f26c2f89ae25f684 (commit)
      from  1cacd7d00a7b3de4a5e11ccce5ee6c50e0a5516d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c88c9ef384b6f7bda9a61b58f26c2f89ae25f684
Author: Justus Winter <justus at gnupg.org>
Date:   Wed Jun 1 12:50:32 2016 +0200

    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 <justus at gnupg.org>

diff --git a/lang/python/tests/t-sig-notation.py b/lang/python/tests/t-sig-notation.py
index 2d832ef..cb4a48e 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 7345a52..843606a 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++;

-----------------------------------------------------------------------

Summary of changes:
 lang/python/tests/t-sig-notation.py | 5 ++---
 tests/gpg/t-sig-notation.c          | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org