[tor-commits] [ooni-probe/master] Rearranged the logic of ensuring that the reactor is shutdown, and removed a

[isis at torproject.org]

commit c18718548bf0551e707fe4d2871bffe794b0e876
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Nov 28 18:38:31 2012 +0000

    Rearranged the logic of ensuring that the reactor is shutdown, and removed a
    couple extra blank lines at the end of /ooni/utils/__init__.py and
    /ooni/utils/hacks.py.
---
 ooni/runner.py         |    4 ++--
 ooni/utils/__init__.py |    2 --
 ooni/utils/hacks.py    |    1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ooni/runner.py b/ooni/runner.py
index 41f3178..8d750ae 100644
--- a/ooni/runner.py
+++ b/ooni/runner.py
@@ -253,10 +253,10 @@ def runTestCases(test_cases, options,
                                            input_list, oreporter)
     except Exception, ex:
         # XXX we probably want to add a log.warn() at some point
-        log.msg("Problem in running test")
+        log.warn("Problem in running test")
         log.exception(ex)
 
+    oreporter.allDone()
     if reactor.running:
         reactor.stop()
-    oreporter.allDone()
 
diff --git a/ooni/utils/__init__.py b/ooni/utils/__init__.py
index 74e1fc2..be5b38a 100644
--- a/ooni/utils/__init__.py
+++ b/ooni/utils/__init__.py
@@ -88,5 +88,3 @@ def randomStr(length, num=True):
     if num:
         chars += string.digits
     return ''.join(random.choice(chars) for x in range(length))
-
-
diff --git a/ooni/utils/hacks.py b/ooni/utils/hacks.py
index 8912bbb..9121982 100644
--- a/ooni/utils/hacks.py
+++ b/ooni/utils/hacks.py
@@ -107,4 +107,3 @@ class OSafeDumper(Emitter, Serializer, OSafeRepresenter, Resolver):
         OSafeRepresenter.__init__(self, default_style=default_style,
                 default_flow_style=default_flow_style)
         Resolver.__init__(self)
-