# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1381939382 -7200
# Node ID 5212c37498f43dace783c5de9de023f185531fae
# Parent  ee3418530a15bd9d506b54bfdce53bb9f76aedd0
Made the message fetching test show the details of the downloaded messages.

diff -r ee3418530a15 -r 5212c37498f4 tests/test_fetch.py
--- a/tests/test_fetch.py	Wed Oct 16 17:42:11 2013 +0200
+++ b/tests/test_fetch.py	Wed Oct 16 18:03:02 2013 +0200
@@ -10,6 +10,25 @@
 except ImportError:
     from StringIO import StringIO
 
+def decrypt(message):
+
+    "Decrypt 'message' if necessary."
+
+    if is_encrypted(message):
+        text = gpg.decryptMessage(message)
+        return Parser().parse(StringIO(text))
+    else:
+        return message
+
+def verify(message):
+
+    "Verify 'message' if possible."
+
+    if is_signed(message):
+        return gpg.verifyMessage(message)
+    else:
+        return None, None, message
+
 if __name__ == "__main__":
     try:
         signer = sys.argv[1]
@@ -38,19 +57,25 @@
         text = sendMessage(encrypted_message, url, "PUT")
         mailbox = Parser().parse(StringIO(text))
 
-        if is_encrypted(mailbox):
-            text = gpg.decryptMessage(mailbox)
-            mailbox = Parser().parse(StringIO(text))
+        mailbox = decrypt(mailbox)
+        fingerprint, identity, content = verify(mailbox)
 
-        if is_signed(mailbox):
-            fingerprint, identity, content = gpg.verifyMessage(mailbox)
+        if fingerprint and identity:
             print >>sys.stderr, "Messages signed by", fingerprint, identity
         else:
-            content = mailbox
             print >>sys.stderr, "Message not signed!"
 
         print >>sys.stderr
-        print content
+
+        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