# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1389291229 -3600
# Node ID 956c401e8f95547d8366651b171c71993689c052
# Parent  20763db29dea7cf0232272594cd7c56b5d4dcbe6
Improved the fetching test, skipping undecryptable/unverifiable messages.

diff -r 20763db29dea -r 956c401e8f95 tests/test_fetch.py
--- a/tests/test_fetch.py	Thu Jan 09 19:04:00 2014 +0100
+++ b/tests/test_fetch.py	Thu Jan 09 19:13:49 2014 +0100
@@ -43,6 +43,8 @@
     part = MIMEText("\n".join(args), "plain", sys.stdin.encoding)
     message.add_update(part)
 
+    # Sign and encrypt the request.
+
     email_message = message.get_payload()
     gpg = GPG()
 
@@ -52,27 +54,41 @@
         text = sendMessage(encrypted_message, url, "PUT")
         mailbox = Parser().parsestr(text)
 
+        # Decrypt and verify the response.
+
         mailbox = decrypt(mailbox)
         fingerprint, identity, content = verify(mailbox)
 
-        if fingerprint and identity:
-            print >>sys.stderr, "Messages signed by", fingerprint, identity
-        else:
-            print >>sys.stderr, "Message not signed!"
-
-        print >>sys.stderr
-
-        if content.is_multipart():
-            for part in content.get_payload():
-                part = decrypt(part)
-                fingerprint, identity, part = verify(part)
-                if fingerprint and identity:
-                    print >>sys.stderr, "Part signed by", fingerprint, identity
-                print part
-        else:
-            print content
-
     except MoinMessageError, exc:
         print >>sys.stderr, exc
 
+    # Indicate the signature details of the response.
+
+    if fingerprint and identity:
+        print >>sys.stderr, "Messages signed by", fingerprint, identity
+    else:
+        print >>sys.stderr, "Message not signed!"
+
+    print >>sys.stderr
+
+    # Show the retrieved messages.
+
+    if content.is_multipart():
+        for part in content.get_payload():
+
+            try:
+                part = decrypt(part)
+                fingerprint, identity, part = verify(part)
+
+            except MoinMessageError, exc:
+                print >>sys.stderr, "Message not shown."
+                print >>sys.stderr, exc
+                continue
+
+            if fingerprint and identity:
+                print >>sys.stderr, "Part signed by", fingerprint, identity
+            print part
+    else:
+        print content
+
 # vim: tabstop=4 expandtab shiftwidth=4