commit ef5e3cbcd1c3a64288f404c3182d15311cb78ddf Author: Arturo Filastò arturo@filasto.net Date: Fri Feb 5 20:03:52 2016 +0100

Fixes to unittests --- ooni/tests/test_oonicli.py | 9 +-------- ooni/tests/test_reporter.py | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index 564f9e6..c57205c 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -158,14 +158,7 @@ class TestRunDirector(ConfigTestCase): assert 'agent' in entry assert 'requests' in entry assert 'socksproxy' in entry - assert 'tampering' in entry - assert 'header_field_name' in entry['tampering'] - assert 'header_field_number' in entry['tampering'] - assert 'header_field_value' in entry['tampering'] - assert 'header_name_capitalization' in entry['tampering'] - assert 'header_name_diff' in entry['tampering'] - assert 'request_line_capitalization' in entry['tampering'] - assert 'total' in entry['tampering'] + assert 'errors' in entry

yield self.run_helper('manipulation/http_header_field_manipulation', ['-b', 'http://4.15.35.157:80'], diff --git a/ooni/tests/test_reporter.py b/ooni/tests/test_reporter.py index f1f7c3a..4b99584 100644 --- a/ooni/tests/test_reporter.py +++ b/ooni/tests/test_reporter.py @@ -26,7 +26,8 @@ test_details = { 'input_hashes': [], 'probe_asn': 'AS0', 'probe_cc': 'ZZ', - 'start_time': time.time() + 'start_time': time.time(), + 'data_format_version': '0.2.0' }

oonib_new_report_message = {