[tor-commits] [ooni-probe/master] Merge branch 'tcptest'

[art@xxxxxxxxxxxxxx]

commit 21fb4cb53e5d69e851aa0a2f4bd48b562d5c2ed3
Merge: f78499c d3985c8
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Thu Nov 22 11:27:06 2012 +0100

    Merge branch 'tcptest'
    
    * tcptest:
      Use usageOptions in HTTP requests test
      Add test that generates a random invalid HTTP request
      Better error handling in tcp test template
      Add some more fine grained matching on received answers
      Add support for optFlags in nettest
      Implement TCP payload sending test template * Example test based on this test template
      Include socksproxy address in HTTP based tests

 nettests/core/http_invalid_requests.py |   63 +++++++++++++++++++++++
 nettests/core/http_requests.py         |   17 ++++--
 nettests/examples/example_tcpt.py      |    8 +++
 ooni/nettest.py                        |    1 +
 ooni/runner.py                         |    8 +++
 ooni/templates/httpt.py                |    1 +
 ooni/templates/scapyt.py               |   24 ++++++++-
 ooni/templates/tcpt.py                 |   87 ++++++++++++++++++++++++++++++++
 8 files changed, 202 insertions(+), 7 deletions(-)

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