[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art at torproject.org]

commit 4c45d6d5bb1608b740ffc39af421ca8891d6767d
Merge: 292b7f2 fe07c4a
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Sep 29 20:17:46 2014 +0200

    Merge branch 'master' of github.com:TheTorProject/ooni-probe
    
    * 'master' of github.com:TheTorProject/ooni-probe:
      Override skipTest so that it does not produce an error inside of twisted 12.2
      Polyfill the connectProtocol to fix compatibility with Twisted 12.2
      Add tests to verify if ooniprobe will work with the various versions of Twisted we are supposed to support.
    
    Conflicts:
    	ooni/tests/bases.py

 .travis.yml         |    8 ++++++--
 ooni/settings.py    |    4 ++--
 ooni/tests/bases.py |    3 +++
 ooni/utils/net.py   |   10 ++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --cc ooni/tests/bases.py
index 5f46515,73bf319..5d177fa
--- a/ooni/tests/bases.py
+++ b/ooni/tests/bases.py
@@@ -7,6 -7,8 +7,9 @@@ class ConfigTestCase(unittest.TestCase)
      def setUp(self):
          config.initialize_ooni_home("ooni_home")
  
+     def skipTest(self, reason):
+         raise unittest.SkipTest(reason)
+ 
      def tearDown(self):
 +        config.set_paths()
          config.read_config_file()