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

[art at torproject.org]

commit e718ff2d5d185781d86f089a84f5486b3970f3f0
Merge: e7ac980 064f3e5
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Mar 10 18:51:51 2014 +0100

    Merge branch 'master' into feature/bridget
    
    * master:
      Return the correct deferred in director start method.
      Initialize all report entries in http requests test
      Add unittests for oonicli.
      Move the parasitic traceroute function to the experimental tests.
      Make the getAddresses function more robust
      Update changelog for 1.0.0
      Make the report format match the ooni-spec
      Clean up the traceroute test
      Fix bug that leads to not showing the help if an option is not present.
      Add a Parasitic Traceroute NetTest
      Refactor Multi Protocol Traceroute, add ParasiticTraceroute
      Add a ScapyTraceroute ScapyProtocol
      Get a Tor Controller connection for a tor ooniprobe did not launch.
      improve hasRawSocketPermission.
    
    Conflicts:
    	ooni/nettest.py

 .travis.yml                                       |    1 +
 ChangeLog.md                                      |   12 +
 bin/ooniprobe                                     |    6 +-
 ooni/deck.py                                      |   15 +-
 ooni/director.py                                  |   30 ++-
 ooni/errors.py                                    |    4 +
 ooni/nettest.py                                   |   16 +-
 ooni/nettests/blocking/http_requests.py           |    9 +-
 ooni/nettests/experimental/parasitictraceroute.py |  157 ++++---------
 ooni/nettests/manipulation/traceroute.py          |  165 +++++---------
 ooni/oonicli.py                                   |   31 +--
 ooni/reporter.py                                  |   13 +-
 ooni/tasks.py                                     |    2 +-
 ooni/templates/scapyt.py                          |    2 +-
 ooni/tests/__init__.py                            |    1 +
 ooni/tests/mocks.py                               |    3 -
 ooni/tests/test_director.py                       |   48 ++--
 ooni/tests/test_oonicli.py                        |  115 ++++++++++
 ooni/tests/test_templates.py                      |    4 -
 ooni/utils/log.py                                 |   37 +++-
 ooni/utils/txscapy.py                             |  242 ++++++++++++++++++++-
 21 files changed, 594 insertions(+), 319 deletions(-)

diff --cc ooni/nettest.py
index 520fcf8,ce7831e..6a182ca
--- a/ooni/nettest.py
+++ b/ooni/nettest.py
@@@ -504,12 -496,8 +504,15 @@@ class NetTest(object)
  
          self.state = NetTestState(self.done)
      
+     def __str__(self):
+         return ' '.join(tc.name for tc, _ in self.testCases)
++    
 +    def doneNetTest(self, result):
 +        print "Summary for %s" % self.testDetails['test_name']
 +        print "------------" + "-"*len(self.testDetails['test_name'])
 +        for test_class in self.testClasses:
 +            test_instance = test_class()
 +            test_instance.displaySummary(self.summary)
  
      def doneReport(self, report_results):
          """