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

[art at torproject.org]

commit f2c08794156e94f1d0a32840c08e80bdd30cae73
Merge: e31917f 847617f
Author: Arturo Filastò <art at fuffa.org>
Date:   Sat Nov 10 14:54:44 2012 +0100

    Merge branch 'master' into http_requests
    
    * master:
      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
      Continue work on OONIB
      Start defining the models of OONIB * Create runner for OONIB

 bin/oonib                   |   41 +++++++++++++--
 ooni/oonicli.py             |    1 -
 ooni/utils/log.py           |   18 ++++++-
 oonib/__init__.py           |   22 ++++++++
 oonib/config.py             |   28 ++++++++++
 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/report/models.py      |  122 ++++++++++++++++++++++++++++++++++++++++++
 oonib/runner.py             |   25 +++++++++
 oonib/testhelpers/daphn3.py |    4 +-
 oonib/testhelpers/httph.py  |  100 ++++++++++++++---------------------
 17 files changed, 592 insertions(+), 135 deletions(-)