commit 232a208152173cadcdd68f852c0a6254dec59481 Author: Arturo Filastò art@fuffa.org Date: Sat Jan 12 18:52:21 2013 +0100

Fix imports in nettest unittest --- tests/test_nettest.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/test_nettest.py b/tests/test_nettest.py index e23e612..af1f8d0 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -1,12 +1,13 @@ -from ooni.measurements import Measurement, NetTest -from ooni.managers import Director, MeasurementsManager -from ooni.tasks import BaseTask, TaskWithTimeout -from os import unlink +import os from StringIO import StringIO from tempfile import TemporaryFile, mkstemp + from twisted.trial import unittest from twisted.internet import defer, reactor

+from ooni.nettest import NetTest +from ooni.tasks import BaseTask + net_test_string = """ from twisted.python import usage from ooni.nettest import NetTestCase @@ -88,5 +89,5 @@ class TestNetTest(unittest.TestCase):

#self.assertEqual(net_test_from_string.test_cases, # net_test_from_file.test_cases) - unlink(net_test_file) + os.unlink(net_test_file)