commit 50c48cc6e50149538c2f647d5dda6c9bb0caaeb7 Merge: 5d0ee1b 16d2709 Author: Arturo Filastò art@fuffa.org Date: Thu Nov 8 16:24:33 2012 +0100
Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
* 'master' of ssh://git-rw.torproject.org/ooni-probe: * Moved metaclass code to separate branch 'meta'. * Removed unused code from assertions.py. * Deleted config.py and process.py. * Removed bug as a result of merging which reintroduced the bug for log messages being printed twice. * Made the submit-patch script create the /patches directory if it doesn't already exist. * Moved /test_inputs/* to /inputs. * Adding new Makefile in top dir * Adding saved copy of *.secdev.org SSL cert so we can correctly check for cert warning. * Updated installation documentation. * Added brief doctrings to get pylint to shutup about it. * Changed the nettest inputParser to no longer be wrapped by @staticmethod, because that might be confusing to test writers. * Changed runner.getTestOptions() to return the localoptions, in addition to setting them as an attribute. * There are still bugs in the options parser, and inputs is a listiterater, which also needs to be fixed. * Fixed oonicli.py trying to catch the wrong exception. * Added a docstring in oonicli.py. * Fixed oonicli.py not printing the help/info message when called without arguments.
Conflicts: nettests/simpletest.py
Makefile | 198 +++++++++++++++++++++++ bin/ooniprobe | 23 ++-- docs/source/install.rst | 12 ++- inputs/README | 46 ++++++ inputs/dns_tamper_file.txt | 3 + inputs/dns_tamper_test_resolvers.txt | 2 + inputs/http_host_file.txt | 2 + inputs/keyword_filtering_file.txt | 2 + inputs/url_lists_file.txt | 2 + nettests/bridge_reachability/echo.py | 8 +- nettests/simpletest.py | 23 ++- ooni/lib/secdev.org.pem | 20 +++ ooni/nettest.py | 13 ++- ooni/oonicli.py | 22 ++-- ooni/runner.py | 3 + submit-patch | 7 +- test_inputs/README | 48 ------ test_inputs/dns_tamper_file.txt | 3 - test_inputs/dns_tamper_test_resolvers.txt | 2 - test_inputs/http_host_file.txt | 2 - test_inputs/keyword_filtering_file.txt | 2 - test_inputs/url_lists_file.txt | 2 - wtf/README | 9 - wtf/assertions.py | 180 --------------------- wtf/config.py | 66 -------- wtf/meta.py | 241 ----------------------------- wtf/process.py | 73 --------- wtf/timer.py | 107 ------------- 28 files changed, 347 insertions(+), 774 deletions(-)
diff --cc nettests/simpletest.py index 11bd485,2769a15..b9efc73 --- a/nettests/simpletest.py +++ b/nettests/simpletest.py @@@ -1,11 -1,21 +1,21 @@@ + #-*- coding: utf-8 -*- + """Contains classes for testing the basic functionality of oonicli.""" + from ooni import nettest + class SimpleTest(nettest.NetTestCase): - inputs = range(1,20) + """ + A very simple test which prints integers, for testing that oonicli is + working correctly. + """ - inputs = range(1, 100) ++ inputs = range(0, 20) optParameters = [['asset', 'a', None, 'Asset file'], - ['controlserver', 'c', 'google.com', 'Specify the control server'], + ['controlserver', 'c', 'google.com', + 'Specify the control server'], ['resume', 'r', 0, 'Resume at this index'], ['other', 'o', None, 'Other arguments']] - def test_foo(self, *arg, **kw): + def test_foo(self): + """Test that tests are working.""" print "Running %s with %s" % ("test_foo", self.input) self.report['test_foo'] = 'Antani' self.report['shared'] = "sblinda"