Commit 4d7f39f0 authored by Arturo Filastò's avatar Arturo Filastò
Browse files

Add the list of test helper addresses to the report

parent 5820bd45

ooni/deck.py

+1 −0
Original line number Diff line number Diff line
@@ -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')

ooni/nettest.py

+3 −1
Original line number Diff line number Diff line
@@ -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)