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

[art at torproject.org]

commit c3f55b7af8d2294a86c953abb6fe0a71f4015d17
Merge: cfab60a 0457513
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Nov 12 20:13:48 2012 +0100

    Merge branch 'daphn3port'
    
    * daphn3port:
      Add unittest for daphn3 mutator.
      Finish reafactoring and porting daphn3. * XXX not fully tested
      Progress towards making daphn3 a test helper backend
      Port daphn3 to be a kit
      Progress on porting daph3 to new API. The client component
      Make nettest take a filename instead of a file
      Trap exceptions that get raised when running tests
      Add exception logging method
      Trap exceptions properly in input unit
      Start rewriting daphn3
      Start working on porting of daphn3

 nettests/core/daphn3.py          |  131 ++++++++++++++++
 ooni/kit/daphn3.py               |  208 +++++++++++++++++++++++++
 ooni/utils/log.py                |    6 +
 oonib/config.py                  |    5 +-
 oonib/oonibackend.py             |    8 +-
 oonib/testhelpers/daphn3.py      |   47 ------
 oonib/testhelpers/tcp_helpers.py |   60 +++++++-
 tests/test_mutate.py             |   15 ++
 to-be-ported/old-api/daphn3.py   |  152 -------------------
 to-be-ported/protocols/daphn3.py |  311 --------------------------------------
 10 files changed, 425 insertions(+), 518 deletions(-)