commit 187ca855cadce110807d9d1f999274a236ac292c Author: Arturo Filastò arturo@filasto.net Date: Fri Feb 5 20:53:11 2016 +0100

Bump up the required minimum version of Twisted to 13.2.0

* This allows us to use some features included in 13.2.0 (such as readBody) and should not be an issues since wheezy-backports has 13.2.0. --- .travis.yml | 4 ---- ooni/tests/test_oonicli.py | 8 +++++--- requirements.txt | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml index 72d7663..acda409 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ language: python env: - - TWISTED=Twisted==12.2 - - TWISTED=Twisted==12.3 - - TWISTED=Twisted==13.0 - - TWISTED=Twisted==13.1 - TWISTED=Twisted==13.2 - TWISTED=Twisted==14.0 - TWISTED=Twisted==14.0.1 diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index 834fb55..564f9e6 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -8,7 +8,6 @@ from ooni.tests import is_internet_connected from ooni.tests.bases import ConfigTestCase from ooni.settings import config from ooni.oonicli import runWithDirector -from ooni.errors import InsufficientPrivileges from ooni.utils.net import hasRawSocketPermission

@@ -140,8 +139,11 @@ class TestRunDirector(ConfigTestCase): def verify_function(entry): assert 'queries' in entry assert 'control_resolver' in entry - assert 'tampering' in entry - assert len(entry['tampering']) == 1 + assert 'errors' in entry + assert 'inconsistent' in entry + assert 'failures' in entry + assert 'successful' in entry + assert len(entry['inconsistent']) == 0

yield self.run_helper('blocking/dns_consistency', ['-b', '8.8.8.8:53', diff --git a/requirements.txt b/requirements.txt index 8b8d5ca..0143b58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ PyYAML>=3.10 -Twisted>=12.2.0 +Twisted>=13.2.0 ipaddr>=2.1.10 pyOpenSSL>=0.13 geoip