1.1 --- a/tests/test_fetch.py Thu Jan 09 19:04:00 2014 +0100
1.2 +++ b/tests/test_fetch.py Thu Jan 09 19:13:49 2014 +0100
1.3 @@ -43,6 +43,8 @@
1.4 part = MIMEText("\n".join(args), "plain", sys.stdin.encoding)
1.5 message.add_update(part)
1.6
1.7 + # Sign and encrypt the request.
1.8 +
1.9 email_message = message.get_payload()
1.10 gpg = GPG()
1.11
1.12 @@ -52,27 +54,41 @@
1.13 text = sendMessage(encrypted_message, url, "PUT")
1.14 mailbox = Parser().parsestr(text)
1.15
1.16 + # Decrypt and verify the response.
1.17 +
1.18 mailbox = decrypt(mailbox)
1.19 fingerprint, identity, content = verify(mailbox)
1.20
1.21 - if fingerprint and identity:
1.22 - print >>sys.stderr, "Messages signed by", fingerprint, identity
1.23 - else:
1.24 - print >>sys.stderr, "Message not signed!"
1.25 -
1.26 - print >>sys.stderr
1.27 -
1.28 - if content.is_multipart():
1.29 - for part in content.get_payload():
1.30 - part = decrypt(part)
1.31 - fingerprint, identity, part = verify(part)
1.32 - if fingerprint and identity:
1.33 - print >>sys.stderr, "Part signed by", fingerprint, identity
1.34 - print part
1.35 - else:
1.36 - print content
1.37 -
1.38 except MoinMessageError, exc:
1.39 print >>sys.stderr, exc
1.40
1.41 + # Indicate the signature details of the response.
1.42 +
1.43 + if fingerprint and identity:
1.44 + print >>sys.stderr, "Messages signed by", fingerprint, identity
1.45 + else:
1.46 + print >>sys.stderr, "Message not signed!"
1.47 +
1.48 + print >>sys.stderr
1.49 +
1.50 + # Show the retrieved messages.
1.51 +
1.52 + if content.is_multipart():
1.53 + for part in content.get_payload():
1.54 +
1.55 + try:
1.56 + part = decrypt(part)
1.57 + fingerprint, identity, part = verify(part)
1.58 +
1.59 + except MoinMessageError, exc:
1.60 + print >>sys.stderr, "Message not shown."
1.61 + print >>sys.stderr, exc
1.62 + continue
1.63 +
1.64 + if fingerprint and identity:
1.65 + print >>sys.stderr, "Part signed by", fingerprint, identity
1.66 + print part
1.67 + else:
1.68 + print content
1.69 +
1.70 # vim: tabstop=4 expandtab shiftwidth=4