commit b4f14c001c9ee1a64906f6aa8bd66eb3448e41a8 Merge: 5b4ce0e 4aeb08e Author: Arturo Filastò arturo@filasto.net Date: Fri Feb 5 17:07:40 2016 +0100

Merge branch 'feature/org_queue'

* feature/org_queue: (78 commits) Check for the minimum version of twisted to support certificates Run apt-get update before the install Edited various bits of the documentation page & moved "using ooniprobe" towards the beginning Log failure when OpenVPN process hangs for user input Handle and log errors when OpenVPN fails to start OpenVPN connection circumvention test add variables for paths, change variable names fix checking if commands exist, other minor changes add/change report variable names * add bootstrapped_success report key with value true when the text 'Press Ctrl-C to terminate.' is found, false when psiphon runs but is not found and none when psiphon does not run * change success report key to request_success * keep psiphon_installed key, but change the name to psiphon_found change again command report structure for ProcessTest changed report structure for ProcessTest catch ProcessExitedAlready exception during cleanup leave success key to none in case psiphon fails fixed identation add success key to the report after doRequest change new psiphon path to the psiphonpath attribute initialize success report variable Fix to make the psiphon test run README: proper path to example inputs README: Vagrantfile requires ooni-backend in parent directory ...

bin/ooniprobequeue | 21 ++ data/ooniprobe.conf.sample | 1 + ooni/director.py | 4 +- ooni/geoip.py | 58 ++--- ooni/nettests/blocking/http_requests.py | 3 + ooni/oonicli.py | 413 ++++++++++++++++++++++---------- ooni/reporter.py | 19 +- ooni/templates/httpt.py | 2 +- ooni/utils/net.py | 4 +- setup.py | 3 +- 10 files changed, 368 insertions(+), 160 deletions(-)

diff --cc ooni/oonicli.py index 1c8d6d0,2b37ad1..864f700 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@@ -285,20 -313,8 +313,12 @@@ def runTestWithDirector(director, globa # deck is a singleton, the default collector set in # ooniprobe.conf will be used

- collector = None - if not global_options['no-collector']: - if global_options['collector']: - collector = global_options['collector'] - elif 'collector' in config.reports \ - and config.reports['collector']: - collector = config.reports['collector'] - elif net_test_loader.collector: - collector = net_test_loader.collector + collector = setupCollector(global_options, net_test_loader)

+ if collector and collector.startswith('httpo:') \ + and (not (config.tor_state or config.tor.socks_port)): + raise errors.TorNotRunning + net_test_loader.annotations = global_options['annotations']

director.startNetTest(net_test_loader,