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

[art at torproject.org]

commit 10ccfa0852179f495307ef1bb5181b29a7161537
Merge: 7147340 3b394e4
Author: Arturo Filastò <art at fuffa.org>
Date:   Sat Nov 10 17:52:05 2012 +0100

    Merge branch 'master' into multiprotocoltraceroute
    
    * master:
      Clean up unused code * Fix imports in oonib
      Add database support to oonib * We have function to automatically create tables based on the Storm db definition   (borrowed from code I wrote for GLBackend) * Start plotting out the structure of the database support.
      Add basic configuration support to oonib
      Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups
      Continue work on OONIB
      Start defining the models of OONIB * Create runner for OONIB
      Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups
      Update example for writing scapy tests. * Make changes to test template of scapy tests
      Continue work on OONIB
      Start defining the models of OONIB * Create runner for OONIB

 bin/oonib                           |   41 +++++++++++-
 nettests/examples/example_scapyt.py |   22 +++++--
 ooni/oonicli.py                     |    1 -
 ooni/templates/scapyt.py            |   19 ++++--
 ooni/utils/log.py                   |   18 +++++-
 oonib/__init__.py                   |   22 ++++++
 oonib/config.py                     |   29 ++++++++
 oonib/db/__init__.py                |   30 +++++++++
 oonib/db/tables.py                  |  123 +++++++++++++++++++++++++++++++++++
 oonib/lib/__init__.py               |    7 --
 oonib/lib/ssl.py                    |    2 +-
 oonib/models.py                     |  122 ++++++++++++++++++++++++++++++++++
 oonib/oonibackend.py                |   46 +++++++-------
 oonib/report/api.py                 |    3 +-
 oonib/report/db/__init__.py         |   33 ---------
 oonib/runner.py                     |   25 +++++++
 oonib/testhelpers/daphn3.py         |    4 +-
 oonib/testhelpers/httph.py          |  100 +++++++++++-----------------
 18 files changed, 501 insertions(+), 146 deletions(-)