[tor-commits] [ooni-probe/master] Add the list of test helper addresses to the report

[art@xxxxxxxxxxxxxx]

commit 4d7f39f0f33160fb158e170f24b8bd18b65cc81a
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Wed Mar 25 11:46:46 2015 +0100

    Add the list of test helper addresses to the report
---
 ooni/deck.py    |    1 +
 ooni/nettest.py |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ooni/deck.py b/ooni/deck.py
index d01378c..18354da 100644
--- a/ooni/deck.py
+++ b/ooni/deck.py
@@ -224,6 +224,7 @@ class Deck(InputFile):
             for th in net_test_loader.requiredTestHelpers:
                 if not th['test_class'].localOptions[th['option']]:
                     th['test_class'].localOptions[th['option']] = test_helpers[th['name']].encode('utf-8')
+                net_test_loader.testHelpers[th['option']] = th['test_class'].localOptions[th['option']]
 
             if not net_test_loader.collector:
                 net_test_loader.collector = collector.encode('utf-8')
diff --git a/ooni/nettest.py b/ooni/nettest.py
index 618066f..c33750f 100644
--- a/ooni/nettest.py
+++ b/ooni/nettest.py
@@ -215,7 +215,8 @@ class NetTestLoader(object):
             'software_version': software_version,
             'options': options,
             'input_hashes': input_file_hashes,
-            'report_id': self.reportID
+            'report_id': self.reportID,
+            'test_helpers': self.testHelpers
         }
         return test_details
 
@@ -323,6 +324,7 @@ class NetTestLoader(object):
         self.testName = test_class_name_to_name(test_class.name)
         self.testCases = test_cases
         self.testClasses = set([])
+        self.testHelpers = {}
 
         if config.reports.unique_id is True:
             self.reportID = randomStr(64)



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