1.1 --- a/tests/test_send.py Tue Jun 25 18:28:44 2013 +0200
1.2 +++ b/tests/test_send.py Tue Jul 09 18:28:56 2013 +0200
1.3 @@ -8,15 +8,25 @@
1.4 try:
1.5 signer = sys.argv[1]
1.6 recipient = sys.argv[2]
1.7 - url = sys.argv[3] + "?action=PostMessage"
1.8 - type = sys.argv[4]
1.9 - action = sys.argv[5]
1.10 - args = sys.argv[6:]
1.11 + if sys.argv[3] == "--forward":
1.12 + forwarder = sys.argv[4]
1.13 + i = 5
1.14 + else:
1.15 + forwarder = None
1.16 + i = 3
1.17 + url = sys.argv[i] + "?action=PostMessage"
1.18 + type = sys.argv[i+1]
1.19 + action = sys.argv[i+2]
1.20 + args = sys.argv[i+3:]
1.21 except IndexError:
1.22 args = None
1.23
1.24 if not args:
1.25 print >>sys.stderr, "Need a signer, recipient, URL, update type, action and some updates as arguments to this program."
1.26 + print >>sys.stderr, "Syntax:"
1.27 + print >>sys.stderr, sys.argv[0], "<signing keyid> <recipient keyid> " \
1.28 + "[ --forward <signing keyid> ] <URL> " \
1.29 + "<update type> <action> <update>..."
1.30 sys.exit(1)
1.31
1.32 message = Message()
1.33 @@ -40,8 +50,18 @@
1.34
1.35 try:
1.36 signed_message = gpg.signMessage(email_message, signer)
1.37 - encrypted_message = gpg.encryptMessage(signed_message, recipient)
1.38 - print sendMessage(encrypted_message, url)
1.39 + message_to_send = gpg.encryptMessage(signed_message, recipient)
1.40 +
1.41 + # Forwarded messages should be timestamped and must be directed to a
1.42 + # message store.
1.43 +
1.44 + if forwarder:
1.45 + timestamp(message_to_send)
1.46 + message_to_send["Update-Action"] = "store"
1.47 + message_to_send = gpg.signMessage(message_to_send, forwarder)
1.48 +
1.49 + print sendMessage(message_to_send, url)
1.50 +
1.51 except MoinMessageError, exc:
1.52 print exc
1.53