[tor-commits] [ooni-probe/master] Fix some bugs in unittests based on minor changes to plugoo

[art at torproject.org]

commit 2212a647109f5ce341a34c92bdfea5af06b70d8a
Author: Arturo Filastò <hellais at torproject.org>
Date:   Thu Aug 2 17:49:20 2012 +0200

    Fix some bugs in unittests based on minor changes to plugoo
---
 ooni/ooniprobe.py   |    4 ++--
 tests/test_tests.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py
index 2189ddb..2799985 100755
--- a/ooni/ooniprobe.py
+++ b/ooni/ooniprobe.py
@@ -94,8 +94,6 @@ def runTest(test, options, global_options, reactor=reactor):
     for x in wgen:
         worker.push(x)
 
-    reactor.run()
-
 class Options(usage.Options):
     tests = plugoo.keys()
     subCommands = []
@@ -142,3 +140,5 @@ if __name__ == "__main__":
 
     runTest(config.subCommand, config.subOptions, config)
 
+    reactor.run()
+
diff --git a/tests/test_tests.py b/tests/test_tests.py
index d0cc88c..dc89b98 100644
--- a/tests/test_tests.py
+++ b/tests/test_tests.py
@@ -40,6 +40,6 @@ class TestsTestCase(unittest.TestCase):
 
         test = DummyTest(None, None, self.dummyreport)
         yield test.startTest(None).addCallback(self._callback)
-        self.assertEqual(self.callbackResults[0][0]['control'], test_dict)
+        self.assertEqual(self.callbackResults[0][0]['return_value'], test_dict)
         return