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

[art at torproject.org]

commit 847617f0c2a1562bac88780dd66649a895dca6db
Merge: cd4960e 7b3d5e7
Author: Arturo Filastò <art at fuffa.org>
Date:   Sat Nov 10 14:51:39 2012 +0100

    Merge branch 'oonib'
    
    * 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
    
    Conflicts:
    	oonib/oonibackend.py
    	oonib/report/db/__init__.py

 ooni/oonicli.py        |    1 -
 oonib/report/models.py |  122 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+), 1 deletions(-)

diff --cc ooni/oonicli.py
index 8e4fa14,8e4fa14..0b8a666
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@@ -27,7 -27,7 +27,6 @@@ from ooni.utils import ne
  from ooni.utils import checkForRoot, NotRootError
  from ooni.utils import log
  
--
  class Options(usage.Options, app.ReactorSelectionMixin):
      synopsis = """%s [options] [path to test].py
      """ % (os.path.basename(sys.argv[0]),)