commit 567a57870a897e5f3657bb5f60f0eaec0984eba3 Author: Arturo Filastò art@fuffa.org Date: Fri Aug 29 11:58:09 2014 +0200

Pep8 fixes. --- oonib/daphn3.py | 2 -- oonib/main/api.py | 3 --- oonib/runner.py | 1 - oonib/test/test_bouncer.py | 4 ++-- oonib/test/test_report.py | 3 ++- 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/oonib/daphn3.py b/oonib/daphn3.py index 4b4eac4..6d4a5f4 100644 --- a/oonib/daphn3.py +++ b/oonib/daphn3.py @@ -1,8 +1,6 @@ -import sys import yaml

from twisted.internet import protocol, defer -from twisted.internet.error import ConnectionDone

from oonib import log

diff --git a/oonib/main/api.py b/oonib/main/api.py index 5bc9761..68f40fa 100644 --- a/oonib/main/api.py +++ b/oonib/main/api.py @@ -1,7 +1,4 @@ -from cyclone import web - from oonib.main import handlers -from oonib.config import config

mainAPI = [ (r"/.*", handlers.OONIBGlobalHandler) diff --git a/oonib/runner.py b/oonib/runner.py index 84b1e88..47ddc35 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -15,7 +15,6 @@ from twisted.python.runtime import platformType

from txtorcon import TCPHiddenServiceEndpoint, TorConfig from txtorcon import launch_tor -from txtorcon import __version__ as txtorcon_version

from oonib.api import ooniBackend, ooniBouncer from oonib.config import config diff --git a/oonib/test/test_bouncer.py b/oonib/test/test_bouncer.py index 6785c2f..2724947 100644 --- a/oonib/test/test_bouncer.py +++ b/oonib/test/test_bouncer.py @@ -233,7 +233,7 @@ class TestBouncer(BaseTestBouncer): self.assertEqual(response_body['net-tests'][0]['input-hashes'][0], 'fake_id')

@defer.inlineCallbacks - def test_net_tests_with_input(self): + def test_net_tests_with_input_invalid_id(self): data = { 'net-tests': [ { @@ -324,7 +324,7 @@ class TestDefaultCollector(BaseTestBouncer): "input-hashes": [], "name": 'imaginary_nettest', "version": '1.0', - }, + } ] }

diff --git a/oonib/test/test_report.py b/oonib/test/test_report.py index f9781f3..59c539f 100644 --- a/oonib/test/test_report.py +++ b/oonib/test/test_report.py @@ -133,7 +133,8 @@ class TestReport(HandlerTestCase): response = yield self.request('/report', "POST", data) response_body = json.loads(response.body) self.assertIn('error', response_body) - self.assertEqual(response_body['error'], 'invalid-request-field probe_asn') + self.assertEqual(response_body['error'], + 'invalid-request-field probe_asn')

@defer.inlineCallbacks def test_create_and_update_report(self):