commit 6a7c0f583de58e63f440288a3e49c00f1e128e56 Merge: 23b7eb2 5f0aa8a Author: Isis Lovecruft isis@torproject.org Date: Tue Nov 19 13:53:29 2013 +0000

Merge branch 'feature/9865-test-harness-coverage' into develop

.coveragerc | 34 ++++++++ .gitignore | 7 ++ .travis.yml | 27 ++++--- Makefile | 3 + README | 7 +- lib/bridgedb/EmailServer.py | 75 +++++++++-------- lib/bridgedb/HTTPServer.py | 11 ++- lib/bridgedb/sitecustomize.py | 34 ++++++++ lib/bridgedb/test/bridgedb.conf | 55 +++++++++++++ lib/bridgedb/test/test_EmailServer.py | 98 +++++++++++++++++++++++ lib/bridgedb/test/test_bridgedb.py | 91 +++++++++++++++++++++ lib/bridgedb/test/test_crypto.py | 57 +++++++++++++ lib/bridgedb/test/test_persistentSaveAndLoad.py | 10 ++- lib/bridgedb/test/util.py | 62 ++++++++++++++ requirements.txt | 4 +- setup.py | 2 +- 16 files changed, 522 insertions(+), 55 deletions(-)