[or-cvs] [torflow/master 23/92] Temporarily disable resuming

[mikeperry@xxxxxxxxxxxxxx]

Author: John M. Schanck <john@xxxxxxxxxxx>
Date: Sat, 10 Jul 2010 20:42:21 -0400
Subject: Temporarily disable resuming
Commit: 7e3b0237beb2842f4b9cb7e099e74f3505a2f62a

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

diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py
index 299f1ae..610accf 100755
--- a/NetworkScanners/ExitAuthority/soat.py
+++ b/NetworkScanners/ExitAuthority/soat.py
@@ -2868,18 +2868,19 @@ def main(argv):
     sys.exit(1)
 
   # Initialize tests
-  if do_resume:
-    plog("NOTICE", "Resuming previous SoaT run #"+str(resume_run))
-    if do_ssl:
-      tests["SSL"] = datahandler.loadTest("SSLTest", resume_run)
+  #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)
 
-    if do_http:
-      tests["HTTP"] = datahandler.loadTest("HTTPTest", resume_run)
+  #  if do_http:
+  #    tests["HTTP"] = datahandler.loadTest("HTTPTest", resume_run)
 
-    if do_html:
-      tests["HTML"] = datahandler.loadTest("HTMLTest", resume_run)
-  
-  elif fixed_targets:
+  #  if do_html:
+  #    tests["HTML"] = datahandler.loadTest("HTMLTest", resume_run)
+
+  if fixed_targets:
     if do_ssl:
       tests["SSL"] = FixedTargetSSLTest(fixed_targets)
 
-- 
1.7.1