[or-cvs] r19201: {torflow} Fix a couple more exceptions after finishing scans. (torflow/trunk/NetworkScanners)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-03-31 07:36:50 -0400 (Tue, 31 Mar 2009)
New Revision: 19201

Modified:
   torflow/trunk/NetworkScanners/soat.py
Log:

Fix a couple more exceptions after finishing scans.



Modified: torflow/trunk/NetworkScanners/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/soat.py	2009-03-31 09:08:14 UTC (rev 19200)
+++ torflow/trunk/NetworkScanners/soat.py	2009-03-31 11:36:50 UTC (rev 19201)
@@ -338,6 +338,7 @@
  
   def rewind(self):
     self._reset()
+    self.update_nodes()
     self.targets = self.get_targets()
     if not self.targets:
       raise NoURLsFound("No URLS found for protocol "+self.proto)
@@ -2545,6 +2546,7 @@
     common_nodes = None
     # Do set intersection and reuse nodes for shared tests
     for test in to_run:
+      if test.finished(): continue
       if not common_nodes: common_nodes = copy.copy(test.nodes)
       else: common_nodes &= test.nodes
       metacon.node_manager._sanity_check(map(lambda id: test.node_map[id], 
@@ -2567,6 +2569,7 @@
     else:
       plog("NOTICE", "No nodes in common between "+", ".join(map(lambda t: t.proto, to_run)))
       for test in to_run:
+        if test.finished(): continue
         current_exit = test.get_node()
         metacon.set_new_exit(current_exit.idhex)
         metacon.get_new_circuit()