[tor-commits] [ooni-probe/master] Removes all references to config.reports.yamloo

[art at torproject.org]

commit 5a8c57b974ee2a272283983010644a7046d96c17
Author: Flavio Amieiro <amieiro.flavio at gmail.com>
Date:   Fri Dec 7 22:12:06 2012 -0200

    Removes all references to config.reports.yamloo
---
 ooni/config.py |    1 -
 ooni/runner.py |    6 +-----
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/ooni/config.py b/ooni/config.py
index 7621041..8ab129d 100644
--- a/ooni/config.py
+++ b/ooni/config.py
@@ -98,7 +98,6 @@ def generateReportFilenames():
 
     test_name = '.'.join(test_filename.split(".")[:-1])
     frm_str = "report_%s_"+otime.timestamp()+".%s"
-    reports.yamloo = frm_str % (test_name, "yamloo")
     reports.pcap = frm_str % (test_name, "pcap")
 
 if not basic:
diff --git a/ooni/runner.py b/ooni/runner.py
index 53e4e55..d978ec2 100644
--- a/ooni/runner.py
+++ b/ooni/runner.py
@@ -411,7 +411,7 @@ def runTestCases(test_cases, options, cmd_line_options):
         oonib_reporter = None
 
     yield yaml_reporter.createReport(options)
-    log.msg("Reporting to file %s" % config.reports.yamloo)
+    log.msg("Reporting to file %s" % yaml_reporter._stream.name)
 
     try:
         input_unit_factory = InputUnitFactory(test_inputs)
@@ -547,10 +547,6 @@ def loadTest(cmd_line_options):
     config.cmd_line_options = cmd_line_options
     config.generateReportFilenames()
 
-    if cmd_line_options['reportfile']:
-        config.reports.yamloo = cmd_line_options['reportfile']+'.yamloo'
-        config.reports.pcap = config.reports.yamloo+'.pcap'
-
     if os.path.exists(config.reports.pcap):
         print "Report PCAP already exists with filename %s" % config.reports.pcap
         print "Renaming it to %s" % config.reports.pcap+".old"