[tor-commits] [ooni-probe/master] * Fixed a bug where the logger printed double messages to stdout.

[isis at torproject.org]

commit 01c85af36fe59586119af437533878233b1bdffd
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Oct 8 01:29:06 2012 +0000

    * Fixed a bug where the logger printed double messages to stdout.
    * Fixed a problem where the reactor wouldn't get started if legacyTests were
      used.
---
 ooni/ooniprobe.py |    7 ++-----
 ooni/runner.py    |    3 ---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py
index c19be5f..5793eee 100755
--- a/ooni/ooniprobe.py
+++ b/ooni/ooniprobe.py
@@ -103,8 +103,6 @@ def runTest(test, options, global_options, reactor=reactor):
     for x in wgen:
         worker.push(x)
 
-    return True
-
 class Options(usage.Options):
     tests = plugoo.keys()
     subCommands = []
@@ -145,10 +143,9 @@ if __name__ == "__main__":
     config.parseOptions()
 
     if not config.subCommand:
-        #print "Error! No Test Specified."
         config.opt_help()
         sys.exit(1)
 
-    if runTest(config.subCommand, config.subOptions, config):
-        reactor.run()
+    runTest(config.subCommand, config.subOptions, config)
+    reactor.run()
 
diff --git a/ooni/runner.py b/ooni/runner.py
index ea8726f..656e73e 100644
--- a/ooni/runner.py
+++ b/ooni/runner.py
@@ -295,10 +295,7 @@ class ORunner(object):
         result.done()
 
     def run(self):
-        #log.start()
-
         self.reporterFactory.options = self.options
-
         for inputUnit in InputUnitFactory(self.inputs):
             self.runWithInputUnit(inputUnit)