[tor-commits] [ooni-probe/master] Update before_i_commit testdeck

[art at torproject.org]

commit 25aa38d851dae046bbeff96bc8cb9104bdad127f
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Nov 29 13:38:49 2012 +0100

    Update before_i_commit testdeck
    * Other misc changes
---
 before_i_commit.testdeck                           |    6 +++---
 .../manipulation/http_header_field_manipulation.py |    3 ++-
 ooni/runner.py                                     |    1 -
 ooni/utils/geodata.py                              |    1 -
 ooni/utils/hacks.py                                |    3 +--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/before_i_commit.testdeck b/before_i_commit.testdeck
index af420be..7877d74 100644
--- a/before_i_commit.testdeck
+++ b/before_i_commit.testdeck
@@ -12,7 +12,7 @@
     logfile: before_i_commit.log
     pcapfile: null
     reportfile: dns_tamper_test.yamloo
-    subargs: [-T, test_inputs/dns_tamper_test_resolvers.txt, -f, test_inputs/dns_tamper_file.txt]
+    subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt]
     test: nettests/blocking/dnstamper.py
 - options:
     collector: null
@@ -20,7 +20,7 @@
     logfile: before_i_commit.log
     pcapfile: null
     reportfile: http_host.yamloo
-    subargs: [-b, 'http://ooni.nu/test', -f, test_inputs/http_host_file.txt]
+    subargs: [-b, 'http://ooni.nu/test', -f, example_inputs/http_host_file.txt]
     test: nettests/manipulation/http_host.py
 # XXX this is disabled because it requires oonib to be running
 #- options:
@@ -29,5 +29,5 @@
 #    logfile: null
 #    pcapfile: null
 #    reportfile: null
-#    subargs: [-h, test_inputs/test_header_field_manipulation.txt]
+#    subargs: [-h, example_inputs/test_header_field_manipulation.txt]
 #    test: nettests/core/http_header_field_manipulation.py
diff --git a/nettests/manipulation/http_header_field_manipulation.py b/nettests/manipulation/http_header_field_manipulation.py
index 08ee8c7..0140638 100644
--- a/nettests/manipulation/http_header_field_manipulation.py
+++ b/nettests/manipulation/http_header_field_manipulation.py
@@ -136,7 +136,8 @@ class HTTPHeaderFieldManipulation(httpt.HTTPTest):
             self.report['tampering']['request_line_capitalization'] = True
 
         request_headers = TrueHeaders(self.request_headers)
-        diff = request_headers.getDiff(response_headers_dict, ignore=['Connection'])
+        diff = request_headers.getDiff(TrueHeaders(response_headers_dict),
+                ignore=['Connection'])
         if diff:
             self.report['tampering']['header_field_name'] = True
         else:
diff --git a/ooni/runner.py b/ooni/runner.py
index 4f59d17..bc9b874 100644
--- a/ooni/runner.py
+++ b/ooni/runner.py
@@ -5,7 +5,6 @@
 # Handles running ooni.nettests as well as
 # ooni.plugoo.tests.OONITests.
 #
-# :authors: Arturo Filastò, Isis Lovecruft
 # :license: see included LICENSE file
 
 import os
diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py
index 447d2eb..6acefd8 100644
--- a/ooni/utils/geodata.py
+++ b/ooni/utils/geodata.py
@@ -5,7 +5,6 @@
 # In here go functions related to the understanding of
 # geographical information of the probe
 #
-# :authors: Arturo Filastò
 # :licence: see LICENSE
 
 import re
diff --git a/ooni/utils/hacks.py b/ooni/utils/hacks.py
index d4e832c..18e9102 100644
--- a/ooni/utils/hacks.py
+++ b/ooni/utils/hacks.py
@@ -4,8 +4,7 @@
 # ********
 # When some software has issues and we need to fix it in a
 # hackish way, we put it in here. This one day will be empty.
-# 
-# :authors: Arturo Filastò
+#
 # :licence: see LICENSE