commit 5e6115557bb67653a8ed1001c53333501a182d67 Merge: 665267d 2266e96 Author: Arturo Filastò art@fuffa.org Date: Sat Nov 10 18:13:03 2012 +0100

Merge branch 'master' into multiprotocoltraceroute

* master: Implement basic HTTP request test that does capitalization variations on the HTTP method * Due to a quirk in twisted.client.Agent that sets HTTP request headers to canonical form we are currently unable to test the request headers. This is ticketized here: https://trac.torproject.org/projects/tor/ticket/7432 Add backend to the required options of http_requests test Refactor the logic for running of tests * There was a bug related to generators not being rewindable we now convert the generator of one input unit to a list Start working on HTTP Requests

nettests/core/http_requests.py | 118 ++++++++++++++++++++++++++++++++++++++++ ooni/oonicli.py | 2 +- ooni/reporter.py | 2 +- ooni/runner.py | 55 ++++++++++++------- ooni/templates/httpt.py | 58 +++++++++++--------- oonib/testhelpers/httph.py | 26 ++++++--- 6 files changed, 205 insertions(+), 56 deletions(-)