[tor-commits] [ooni-probe/develop] Merge branch 'master' into feature/task_manager

[isis at torproject.org]

commit 9b00fa993757df5081c042f1deda32f907d235f9
Merge: 46c4db1 a62e36d
Author: Arturo Filastò <art at fuffa.org>
Date:   Tue Mar 5 16:33:01 2013 +0100

    Merge branch 'master' into feature/task_manager
    
    * master:
      Add changelog for ooni
      Update ooniprobe.conf.sample
      Add tests for YAML reporter
      Open YAML report in createReport
      Update tests to reflect change of syntax in NetTestLoader
      Update NetTest tests to reflect change of syntax
    
    Conflicts:
    	ooni/errors.py
    	tests/test_director.py
    	tests/test_nettest.py

 ChangeLog.md           |  253 ++++++++++++++++++++++++++++++++++++++++++++++++
 ooni/errors.py         |    6 ++
 ooni/reporter.py       |   12 ++-
 ooniprobe.conf.sample  |    4 +-
 tests/test_managers.py |    2 +-
 tests/test_reporter.py |  115 +++++++++++++++++-----
 6 files changed, 362 insertions(+), 30 deletions(-)

diff --cc ooni/errors.py
index a194b96,36a042f..85f39ab
--- a/ooni/errors.py
+++ b/ooni/errors.py
@@@ -126,7 -126,9 +126,13 @@@ class InvalidOONIBCollectorAddress(Exce
  class AllReportersFailed(Exception):
      pass
  
 +class GeoIPDataFilesNotFound(Exception):
 +    pass
 +
 +
+ class ReportNotCreated(Exception):
+     pass
+ 
+ class ReportAlreadyClosed(Exception):
+     pass
+