commit 90d39f7e79e7c177ac31b17b32104e4550e350be Merge: 99c8c6d 056a24b Author: aagbsn aagbsn@extc.org Date: Mon Apr 29 22:15:58 2013 -0700

Merge pull request #64 from hellais/feature/task_manager

Improvements to feature/task manager

.travis.yml | 10 +- collector | 1 - decks/before_i_commit.testdeck | 8 +- decks/short_no_root.deck | 10 +- ooni/__init__.py | 4 +- ooni/director.py | 19 ++- ooni/errors.py | 25 ++++ ooni/geoip.py | 12 +- ooni/managers.py | 28 +++-- ooni/nettest.py | 120 +++++++++--------- ooni/oonicli.py | 74 ++++++++---- ooni/reporter.py | 187 ++++++++++++++-------------- ooni/runner.py | 241 ------------------------------------- ooni/tasks.py | 24 ++++ ooni/tests/disabled_test_utils.py | 21 ++++ ooni/tests/mocks.py | 2 +- ooni/tests/test-class-design.py | 101 ---------------- ooni/tests/test_director.py | 58 --------- ooni/tests/test_inputunit.py | 29 ----- ooni/tests/test_managers.py | 12 +- ooni/tests/test_nettest.py | 106 +++++++--------- ooni/tests/test_reporter.py | 238 ------------------------------------ ooni/tests/test_utils.py | 20 --- ooni/utils/geodata.py | 40 ++++++ ooniprobe.conf.sample | 12 ++ setup.py | 2 +- tests/test_geoip.py | 137 --------------------- 27 files changed, 430 insertions(+), 1111 deletions(-)