[tor-commits] [ooni-probe/master] Update to match suggestion by Art

[ioerror@xxxxxxxxxxxxxx]

commit 03076bc639c8dc3e15a6fb4509fdb611042e7b9a
Author: Jacob Appelbaum <jacob@xxxxxxxxxxxxx>
Date:   Thu Dec 6 02:20:15 2012 +0630

    Update to match suggestion by Art
---
 nettests/third_party/netalyzr.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nettests/third_party/netalyzr.py b/nettests/third_party/netalyzr.py
index 01c57f8..b3a0a3d 100644
--- a/nettests/third_party/netalyzr.py
+++ b/nettests/third_party/netalyzr.py
@@ -33,9 +33,9 @@ class NetalyzrWrapperTest(nettest.NetTestCase):
 
     def blocking_call(self):
         try:
-            result = threads.blockingCallFromThread(reactor, os.system(self.run_me))
+            result = threads.blockingCallFromThread(reactor, os.system, self.run_me) 
         except:
-            print "Please check " + self.output_file + "for Netalyzr output"
+            log.debug("Netalyzr had an error, please see the log file: %s" % self.output_file)
         finally:
             reactor.callFromThread(reactor.stop)
             self.clean_up()
@@ -43,6 +43,7 @@ class NetalyzrWrapperTest(nettest.NetTestCase):
     def clean_up(self):
         self.report['netalyzr_report'] = self.output_file
         log.debug("finished running NetalzrWrapper")
+        log.debug("Please check %s for Netalyzr output" % self.output_file)
 
     def test_run_netalyzr(self):
         """

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits