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

[isis at torproject.org]

commit 46c4db194d2e0cda648a500291f0d605dd445e96
Merge: 18266c6 997a747
Author: Arturo Filastò <art at fuffa.org>
Date:   Tue Mar 5 16:21:24 2013 +0100

    Merge branch 'master' into feature/task_manager
    
    * master:
      Remove unneeded commented out line
      Flatten the reporter keys
      Return something in txscapy
      Update before_i_commit script to make it work (cherry picked from commit 9cdf5596c8f16cac819afdaf1b9b537b36f796a6)
      Refactor logic for importing scapy related functions
      Add sent packets to report and use startSending instead of sendPackets
    
    Conflicts:
    	decks/before_i_commit.testdeck

 ooni/reporter.py          |   15 +++++-------
 ooni/templates/scapyt.py  |    6 ++---
 ooni/utils/net.py         |    2 +-
 ooni/utils/txscapy.py     |   56 +++++++++++++++++++++++++++++++++------------
 scripts/example_parser.py |    5 ++--
 5 files changed, 54 insertions(+), 30 deletions(-)

diff --cc ooni/reporter.py
index 69d4892,1f6c3e6..a0c9466
--- a/ooni/reporter.py
+++ b/ooni/reporter.py
@@@ -147,19 -183,13 +147,16 @@@ class OReporter(object)
          else:
              test_input = test.input
  
-         test_started = test._start_time
-         test_runtime = time.time() - test_started
- 
-         report = {'input': test_input,
-                 'test_name': test_name,
-                 'test_started': test_started,
-                 'test_runtime': test_runtime,
-                 'report': test_report}
-         return defer.maybeDeferred(self.writeReportEntry, report)
+         test_report['input'] = test_input
+         test_report['test_name'] = test_name
+         test_report['test_started'] = test._start_time
+         test_report['test_runtime'] = time.time() - test._start_time
+ 
+         return defer.maybeDeferred(self.writeReportEntry, test_report)
  
 +class InvalidDestination(ReporterException):
 +    pass
 +
  class YAMLReporter(OReporter):
      """
      These are useful functions for reporting to YAML format.