commit 25c87329e6a4d349709d890928fabad707c29bf3 Merge: 403d60e 71552b0 Author: Arturo Filastò art@fuffa.org Date: Tue Aug 27 11:36:47 2013 +0200

Merge branch 'master' into fix/link_task_schedulers

* master: (36 commits) Clean up error messages Handle more failure types Properly handle the case when we don't get a collector by asking a bouncer Track the number of failed reporters Fix report write failure bug Track the number of failures, not the instances. Reschedule failures immediately Link TaskManagers by Least Available Slots Add CouldNotFindTestCollector error Fix some issues with ooni.deck Simplify the bouncer API Use error-code 406 to indicate policy rejection Add support for looking up test helpers via a bouncer. Add component.json file to ng-upload Update LICENSE file Start outlining the classes for policy handling Only run unittests when there is something on port 8888 Add a basic deck that includes inputs as URLs Fix bug that leads decks not being started properly Implement downloading of input files based on URL in deck file ...

Conflicts: ooni/templates/httpt.py

.travis.yml | 1 - LICENSE | 2 +- data/nettests/blocking/dnsconsistency.py | 4 +- data/nettests/blocking/http_requests.py | 1 - data/nettests/manipulation/dnsspoof.py | 1 + .../manipulation/http_header_field_manipulation.py | 1 + data/nettests/manipulation/http_host.py | 1 + .../manipulation/http_invalid_request_line.py | 4 +- data/nettests/manipulation/traceroute.py | 3 +- data/ui/app/libs/ng-upload/component.json | 23 +++ decks/basic.deck | 24 +++ ooni/deck.py | 87 ++++++++ ooni/director.py | 1 + ooni/errors.py | 7 + ooni/nettest.py | 81 +++++++- ooni/oonibclient.py | 212 ++++++++++++++++++++ ooni/oonicli.py | 133 ++++++++---- ooni/reporter.py | 49 ++++- ooni/tasks.py | 7 +- ooni/templates/httpt.py | 8 +- ooni/tests/test_nettest.py | 3 + ooni/tests/test_oonibclient.py | 85 ++++++++ ooni/utils/net.py | 30 ++- 23 files changed, 701 insertions(+), 67 deletions(-)