commit 68fb840e72e338674b39b36b0b2798b015397ba1 Author: Arturo Filastò art@fuffa.org Date: Wed Feb 27 17:11:22 2013 +0100

Fix director unittest --- ooni/tests/test_director.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ooni/tests/test_director.py b/ooni/tests/test_director.py index 79a1e96..a9dfbe8 100644 --- a/ooni/tests/test_director.py +++ b/ooni/tests/test_director.py @@ -42,10 +42,11 @@ class TestDirector(unittest.TestCase): pass

def test_start_net_test(self): - options = {'test':net_test_string, 'subargs':dummyArgs} - net_test_loader = NetTestLoader(options) - net_test_loader.checkOptions() - d = self.director.startNetTest('', net_test_loader, self.reporters) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + + ntl.checkOptions() + d = self.director.startNetTest('', ntl, self.reporters)

@d.addCallback def done(result):