[tor-commits] [ooni-probe/master] Fix annotations in ooniprobe

art at torproject.org art at torproject.org
Wed Dec 2 11:49:13 UTC 2015


commit 5a20acd1784f1326f3a35225f1b1722fc1ad5de1
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Nov 26 18:39:06 2015 +0100

    Fix annotations in ooniprobe
---
 ooni/nettest.py |    4 +++-
 ooni/oonicli.py |    3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ooni/nettest.py b/ooni/nettest.py
index 9eb6f37..848d958 100644
--- a/ooni/nettest.py
+++ b/ooni/nettest.py
@@ -139,6 +139,7 @@ class NetTestLoader(object):
             "(httpo://[a-z0-9]{16}\.onion)/input/([a-z0-9]{64})$")
         self.options = options
         self.testCases = []
+        self.annotations = {}
 
         if test_file:
             self.loadNetTestFile(test_file)
@@ -217,7 +218,8 @@ class NetTestLoader(object):
             'options': options,
             'input_hashes': input_file_hashes,
             'report_id': self.reportID,
-            'test_helpers': self.testHelpers
+            'test_helpers': self.testHelpers,
+            'annotations': self.annotations
         }
         return test_details
 
diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index 030014e..1c8d6d0 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -299,8 +299,7 @@ def runWithDirector(logging=True, start_tor=True, check_incoherences=True):
                     and (not (config.tor_state or config.tor.socks_port)):
                 raise errors.TorNotRunning
 
-            test_details = net_test_loader.testDetails
-            test_details['annotations'] = global_options['annotations']
+            net_test_loader.annotations = global_options['annotations']
 
             director.startNetTest(net_test_loader,
                                   global_options['reportfile'],





More information about the tor-commits mailing list