commit 3ccb5f91b59e8b53e6bd11170613a326a68d64bc Merge: 30e4744 9461a25 Author: Arturo Filastò hellais@users.noreply.github.com Date: Fri Mar 7 16:40:29 2014 +0100

Merge pull request #291 from TheTorProject/feature/better_testing

Add unittests for oonicli.

.travis.yml | 1 + bin/ooniprobe | 6 ++- ooni/director.py | 16 +++--- ooni/nettest.py | 11 ++-- ooni/oonicli.py | 31 +++++------- ooni/reporter.py | 11 ++-- ooni/tasks.py | 2 +- ooni/tests/__init__.py | 1 + ooni/tests/mocks.py | 3 -- ooni/tests/test_director.py | 48 ++++++++++-------- ooni/tests/test_oonicli.py | 115 ++++++++++++++++++++++++++++++++++++++++++ ooni/tests/test_templates.py | 4 -- ooni/utils/log.py | 37 +++++++++----- 13 files changed, 207 insertions(+), 79 deletions(-)