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

[art at torproject.org]

commit 08d54806912c2e690f294d0b07afbe9e54f62cf8
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 b3e1013..1167da9 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -299,8 +299,7 @@ def runTestWithDirector(director, global_options, url=None,
 
             collector = setupCollector(global_options, net_test_loader)
 
-            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'],