February 2014 - tor-commits - lists.torproject.org

[ooni-probe/master] Re-enable manager test.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 353fc18d43e51725837ed542749659c0de91b830 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 18:39:46 2014 +0100 Re-enable manager test. --- ooni/tests/test_managers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/tests/test_managers.py b/ooni/tests/test_managers.py index 8265d8f..ab9a9ec 100644 --- a/ooni/tests/test_managers.py +++ b/ooni/tests/test_managers.py @@ -163,7 +163,7 @@ class TestTaskManager(unittest.TestCase): return mock_task.done - def dd_test_task_retry_and_succeed_56_tasks(self): + def test_task_retry_and_succeed_56_tasks(self): """ XXX this test fails in a non-deterministic manner. """

1 0

[ooni-probe/master] Remove useless code from httpt test template
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 53dca8b6de90b4546e52c269b050ed683e529755 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 18:41:19 2014 +0100 Remove useless code from httpt test template --- ooni/templates/httpt.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 7c54782..403e222 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -49,12 +49,6 @@ class HTTPTest(NetTestCase): baseParameters = [['socksproxy', 's', None, 'Specify a socks proxy to use for requests (ip:port)']] - request = {} - response = {} - - requests = [] - responses = [] - def _setUp(self): super(HTTPTest, self)._setUp()

1 0

[ooni-probe/master] Fix bug spotted in nettest via unittesting.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 7418fe5961c708872632064302325bdcf4d091eb Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 18:40:23 2014 +0100 Fix bug spotted in nettest via unittesting. --- ooni/nettest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index ca831eb..7671221 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -665,7 +665,7 @@ class NetTestCase(object): """ This is the internal setup method to be overwritten by templates. """ - pass + self.report = {} def setUp(self): """

1 0

[ooni-probe/master] Ignore the api/* code as it's not used
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 34edc8cb6633eeade296b1628e2541e5e85c605e Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 18:40:54 2014 +0100 Ignore the api/* code as it's not used --- .coveragerc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 126774a..f158adc 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,4 +1,4 @@ [run] source = ooni [report] -omit = ooni/nettests/* +omit = ooni/nettests/*, ooni/api/*

1 0

[ooni-probe/master] Add unittests for the HTTP test template.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit e04bdd9bc27c5c19e55cce98d2876403d9c7397d Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 18:41:37 2014 +0100 Add unittests for the HTTP test template. --- ooni/tests/test_templates.py | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/ooni/tests/test_templates.py b/ooni/tests/test_templates.py new file mode 100644 index 0000000..987c7fa --- /dev/null +++ b/ooni/tests/test_templates.py @@ -0,0 +1,43 @@ +from ooni.settings import config + +from ooni.templates import httpt + +from twisted.internet.error import DNSLookupError +from twisted.internet import reactor, defer +from twisted.trial import unittest + +config.logging = False + +class TestHTTPT(unittest.TestCase): + def setUp(self): + from twisted.web.resource import Resource + from twisted.web.server import Site + class DummyResource(Resource): + isLeaf = True + def render_GET(self, request): + return "%s" % request.method + r = DummyResource() + factory = Site(r) + self.port = reactor.listenTCP(8880, factory) + + def tearDown(self): + self.port.stopListening() + + @defer.inlineCallbacks + def test_do_request(self): + http_test = httpt.HTTPTest() + http_test.localOptions['socksproxy'] = None + http_test._setUp() + response = yield http_test.doRequest('http://localhost:8880/') + assert response.body == "GET" + assert len(http_test.report['requests']) == 1 + assert 'request' in http_test.report['requests'][0] + assert 'response' in http_test.report['requests'][0] + + @defer.inlineCallbacks + def test_do_failing_request(self): + http_test = httpt.HTTPTest() + http_test.localOptions['socksproxy'] = None + http_test._setUp() + yield self.assertFailure(http_test.doRequest('http://invaliddomain/'), DNSLookupError) + assert http_test.report['requests'][0]['failure'] == 'dns_lookup_error'

1 0

[ooni-probe/master] Add tests for geoip
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 3748ca57efcf7e1b084fcde0e03d979177257e7a Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 19:01:54 2014 +0100 Add tests for geoip --- ooni/tests/test_geoip.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ooni/tests/test_geoip.py b/ooni/tests/test_geoip.py new file mode 100644 index 0000000..ac18a2e --- /dev/null +++ b/ooni/tests/test_geoip.py @@ -0,0 +1,22 @@ +from twisted.internet import defer +from twisted.trial import unittest + +from ooni.settings import config +from ooni import geoip + +class TestGeoIP(unittest.TestCase): + def setUp(self): + config.set_paths() + config.read_config_file() + + def test_ip_to_location(self): + location = geoip.IPToLocation('8.8.8.8') + assert location['countrycode'] == 'US' + assert location['asn'] == 'AS15169' + assert 'city' in location + + @defer.inlineCallbacks + def test_probe_ip(self): + probe_ip = geoip.ProbeIP() + res = yield probe_ip.lookup() + assert len(res.split('.')) == 4

1 0

[ooni-probe/master] Move overriding of datadir to the running of the oonibclient test.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 94c8f9cf78cc11e073d348b5de26bc5b216e1efe Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 20:13:46 2014 +0100 Move overriding of datadir to the running of the oonibclient test. --- ooni/tests/test_oonibclient.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ooni/tests/test_oonibclient.py b/ooni/tests/test_oonibclient.py index f166ae7..b0bb9ba 100644 --- a/ooni/tests/test_oonibclient.py +++ b/ooni/tests/test_oonibclient.py @@ -10,9 +10,6 @@ from ooni.utils import log from ooni.settings import config from ooni.oonibclient import OONIBClient -data_dir = '/tmp/testooni' -config.advanced.data_dir = data_dir - input_id = '37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1' deck_id = 'd4ae40ecfb3c1b943748cce503ab8233efce7823f3e391058fc0f87829c644ed' @@ -24,6 +21,10 @@ class TestOONIBClient(unittest.TestCase): try: s.connect((host, port)) s.shutdown(2) + + data_dir = '/tmp/testooni' + config.advanced.data_dir = data_dir + try: shutil.rmtree(data_dir) except: pass os.mkdir(data_dir)

1 0

[ooni-probe/master] Disable logging globally in tests.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit e9acc1c3825124d1ae6be92928f61b37fe363844 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 19:02:08 2014 +0100 Disable logging globally in tests. --- ooni/tests/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ooni/tests/__init__.py b/ooni/tests/__init__.py index e69de29..1b5c949 100644 --- a/ooni/tests/__init__.py +++ b/ooni/tests/__init__.py @@ -0,0 +1,3 @@ +from ooni.settings import config + +config.logging = False

1 0

[ooni-probe/master] Use trial unittest instead of python unittest
by art＠torproject.org 28 Feb '14

28 Feb '14

commit 331b3987ba09db5d8f774509bedd30c3c6522795 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 20:10:40 2014 +0100 Use trial unittest instead of python unittest --- ooni/tests/test_utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ooni/tests/test_utils.py b/ooni/tests/test_utils.py index a374232..4a9314f 100644 --- a/ooni/tests/test_utils.py +++ b/ooni/tests/test_utils.py @@ -1,5 +1,6 @@ import os -import unittest +from twisted.trial import unittest + from ooni.utils import pushFilenameStack class TestUtils(unittest.TestCase): def test_pushFilenameStack(self):

1 0

[ooni-probe/master] Dynamically generate the deck hash path.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit baed9a2481f591f8139920217d32e02dffff934f Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 19:58:39 2014 +0100 Dynamically generate the deck hash path. --- ooni/deck.py | 4 ++-- ooni/tests/test_deck.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 8212c3d..1b5fd72 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -17,7 +17,7 @@ from hashlib import sha256 class InputFile(object): def __init__(self, input_hash, base_path=config.inputs_directory): self.id = input_hash - cache_path = os.path.join(base_path, input_hash) + cache_path = os.path.join(os.path.abspath(base_path), input_hash) self.cached_file = cache_path self.cached_descriptor = cache_path + '.desc' @@ -93,7 +93,7 @@ class Deck(InputFile): self.oonibclient = OONIBClient(self.bouncer) - self.decksDirectory = decks_directory + self.decksDirectory = os.path.abspath(decks_directory) self.deckHash = deck_hash if deckFile: self.loadDeck(deckFile) diff --git a/ooni/tests/test_deck.py b/ooni/tests/test_deck.py index 3a330c0..7c7bc35 100644 --- a/ooni/tests/test_deck.py +++ b/ooni/tests/test_deck.py @@ -41,7 +41,7 @@ class BaseTestCase(unittest.TestCase): subargs: [] test_file: %s/dummy_test.py testdeck: null - """ % self.cwd +""" % self.cwd class TestInputFile(BaseTestCase): def test_file_cached(self): @@ -93,8 +93,8 @@ class MockOONIBClient(object): class TestDeck(BaseTestCase): def setUp(self): super(TestDeck, self).setUp() - self.deck_file = os.path.join(self.cwd, - '4145fd06158ce16e45469fc6b41c3d79a93b958925484ffa93c205d9f3b2e30a') + deck_hash = sha256(self.dummy_deck_content).hexdigest() + self.deck_file = os.path.join(self.cwd, deck_hash) with open(self.deck_file, 'w+') as f: f.write(self.dummy_deck_content) with open(os.path.join(self.cwd, 'dummy_test.py'), 'w+') as f:

1 0