commit 9ba031fc944082e6da6c298bff50c2fcb54f92a7 Merge: e2de6af a78d22c Author: Isis Lovecruft isis@torproject.org Date: Fri Jun 6 04:30:23 2014 +0000

Merge branch 'fix/9874-automate-email-tests' into develop

.travis.requirements.txt | 9 + .travis.yml | 43 +- doc/sphinx/source/bridgedb.EmailServer.rst | 8 - doc/sphinx/source/bridgedb.email.autoresponder.rst | 8 + doc/sphinx/source/bridgedb.email.dkim.rst | 8 + doc/sphinx/source/bridgedb.email.request.rst | 8 + doc/sphinx/source/bridgedb.email.server.rst | 8 + doc/sphinx/source/bridgedb.email.templates.rst | 8 + doc/sphinx/source/bridgedb.rst | 7 +- doc/sphinx/source/conf.py | 7 +- lib/bridgedb/email/__init__.py | 1 + lib/bridgedb/email/autoresponder.py | 646 +++++++++++++++ lib/bridgedb/email/dkim.py | 55 ++ lib/bridgedb/email/server.py | 734 +++++------------ lib/bridgedb/test/email_helpers.py | 160 ++++ lib/bridgedb/test/test_email_autoresponder.py | 562 +++++++++++++ lib/bridgedb/test/test_email_dkim.py | 86 ++ lib/bridgedb/test/test_email_server.py | 845 +++++++++++--------- lib/bridgedb/test/util.py | 10 + requirements.txt | 4 +- setup.py | 2 +- 21 files changed, 2276 insertions(+), 943 deletions(-)