[or-cvs] [torflow/master 61/92] Made resume flag act as advertised

[mikeperry@xxxxxxxxxxxxxx]

Author: John M. Schanck <john@xxxxxxxxxxx>
Date: Sat, 7 Aug 2010 17:27:48 -0400
Subject: Made resume flag act as advertised
Commit: badb84e6f37b2b0661c3ac4a3145a0ade3187358

---
 NetworkScanners/ExitAuthority/soat.py |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py
index 7e583a5..fb4a772 100755
--- a/NetworkScanners/ExitAuthority/soat.py
+++ b/NetworkScanners/ExitAuthority/soat.py
@@ -2895,10 +2895,7 @@ def main(argv):
       num_rescan_tests_per_node = int(flag[1])
     if flag[0] == "--resume":
       do_resume = True
-      if flag[1]:
-        resume_run=int(flag[1])
-      else:
-        resume_run=-1
+      resume_run=int(flag[1])
 
   TorUtil.read_config(data_dir+"/torctl.cfg")
 
@@ -2976,17 +2973,18 @@ def main(argv):
     return
 
   # Initialize tests
-  #XXX: Resume currently broken. New depickling routines required
   if do_resume:
-    plog("NOTICE", "Resuming previous SoaT run #"+str(resume_run))
     if do_ssl:
       tests["SSL"] = datahandler.loadTest("SSLTest", resume_run)
+      plog("NOTICE", "Resuming previous SSL run "+os.path.split(tests["SSL"].filename)[-1])
 
     if do_http:
       tests["HTTP"] = datahandler.loadTest("HTTPTest", resume_run)
+      plog("NOTICE", "Resuming previous HTTP run "+os.path.split(tests["HTTP"].filename)[-1])
 
     if do_html:
       tests["HTML"] = datahandler.loadTest("HTMLTest", resume_run)
+      plog("NOTICE", "Resuming previous HTML run "+os.path.split(tests["HTML"].filename)[-1])
 
   elif fixed_targets:
     if do_ssl:
-- 
1.7.1