[tor-commits] [ooni-probe/master] Fix before I commit script

[art at torproject.org]

commit 37dd647d6def02f080c343454cb51239dc01b832
Author: Arturo Filastò <art at fuffa.org>
Date:   Wed Nov 28 18:04:11 2012 +0100

    Fix before I commit script
---
 before_i_commit.testdeck |   22 +++-------------------
 ooni/oonicli.py          |    2 ++
 ooni/runner.py           |    2 +-
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/before_i_commit.testdeck b/before_i_commit.testdeck
index 7fb33f9..af420be 100644
--- a/before_i_commit.testdeck
+++ b/before_i_commit.testdeck
@@ -5,7 +5,7 @@
     pcapfile: null
     reportfile: captive_portal_test.yamloo
     subargs: []
-    test: nettests/core/captiveportal.py
+    test: nettests/manipulation/captiveportal.py
 - options:
     collector: null
     help: 0
@@ -13,7 +13,7 @@
     pcapfile: null
     reportfile: dns_tamper_test.yamloo
     subargs: [-T, test_inputs/dns_tamper_test_resolvers.txt, -f, test_inputs/dns_tamper_file.txt]
-    test: nettests/core/dnstamper.py
+    test: nettests/blocking/dnstamper.py
 - options:
     collector: null
     help: 0
@@ -21,23 +21,7 @@
     pcapfile: null
     reportfile: http_host.yamloo
     subargs: [-b, 'http://ooni.nu/test', -f, test_inputs/http_host_file.txt]
-    test: nettests/core/http_host.py
-- options:
-    collector: null
-    help: 0
-    logfile: before_i_commit.log
-    pcapfile: null
-    reportfile: http_keyword_filtering.yamloo
-    subargs: [-b, 'http://ooni.nu/test/', -f, test_inputs/keyword_filtering_file.txt]
-    test: nettests/core/http_keyword_filtering.py
-- options:
-    collector: null
-    help: 0
-    logfile: before_i_commit.log
-    pcapfile: null
-    reportfile: http_url_lists.yamloo
-    subargs: [-f, test_inputs/url_lists_file.txt]
-    test: nettests/core/http_url_list.py
+    test: nettests/manipulation/http_host.py
 # XXX this is disabled because it requires oonib to be running
 #- options:
 #    collector: null
diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index ca80ad7..f706ee3 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -166,6 +166,8 @@ def run():
             cmd_line_options = test['options']
             if resume:
                 cmd_line_options['resume'] = True
+            else:
+                cmd_line_options['resume'] = False
             test_list.append(runner.loadTest(cmd_line_options))
     else:
         log.msg("No test deck detected")
diff --git a/ooni/runner.py b/ooni/runner.py
index 9bdedfc..4f59d17 100644
--- a/ooni/runner.py
+++ b/ooni/runner.py
@@ -442,7 +442,7 @@ def runTestCases(test_cases, options, cmd_line_options):
         log.debug("Resuming %s" % test_filename)
         resumeTest(test_filename, input_unit_factory)
     else:
-        log.debug("Nothing to resume for %s" % test_filename)
+        log.debug("Not going to resume %s" % test_filename)
         config.stateDict[test_filename] = 0
 
     updateProgressMeters(test_filename, input_unit_factory, len(test_cases))