commit a9e1e9d91299a6033db061344425553e20a8d55e Author: Arturo Filastò arturo@filasto.net Date: Mon Jun 20 14:31:01 2016 +0200

Use ConfigNetTest case inside of test_nettest as well --- ooni/tests/test_nettest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index 55134d3..4298fe9 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -219,7 +219,7 @@ dummyInputFile = 'dummyInputFile.txt'

-class TestNetTest(unittest.TestCase): +class TestNetTest(ConfigTestCase): timeout = 1

def setUp(self): @@ -227,11 +227,13 @@ class TestNetTest(unittest.TestCase): with open(dummyInputFile, 'w') as f: for i in range(10): f.write("%s\n" % i) + super(TestNetTest, self).setUp()

def tearDown(self): os.remove(dummyInputFile) if self.filename != "": os.remove(self.filename) + super(TestNetTest, self).tearDown()

def assertCallable(self, thing): self.assertIn('__call__', dir(thing))