[or-cvs] [torflow/master 41/92] Check that FixedTarget urls are useable before starting test

[mikeperry at torproject.org]

Author: John M. Schanck <john at anomos.info>
Date: Wed, 28 Jul 2010 03:05:09 -0400
Subject: Check that FixedTarget urls are useable before starting test
Commit: 90c90d31036c691f9c9aaf7f88b6f051e32e6285

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

diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py
index baab5d3..9582a4e 100755
--- a/NetworkScanners/ExitAuthority/soat.py
+++ b/NetworkScanners/ExitAuthority/soat.py
@@ -1911,13 +1911,13 @@ class FixedTargetHTTPTest(FixedTargetTest, BaseHTTPTest):
   def __init__(self, targets):
     BaseHTTPTest.__init__(self)
     utargets = [t for t in targets if self._is_useable_url(t, ['http'])]
-    FixedTargetTest.__init__(self, targets)
+    FixedTargetTest.__init__(self, utargets)
 
 class FixedTargetHTMLTest(FixedTargetTest, BaseHTMLTest):
   def __init__(self, targets):
     BaseHTMLTest.__init__(self)
     utargets = [t for t in targets if self._is_useable_url(t, ['http'])]
-    FixedTargetTest.__init__(self, targets)
+    FixedTargetTest.__init__(self, utargets)
   def _add_recursive_targets(self, soup, orig_addr):
     # Don't recurse for FixedTarget tests
     pass
@@ -1925,8 +1925,8 @@ class FixedTargetHTMLTest(FixedTargetTest, BaseHTMLTest):
 class FixedTargetSSLTest(FixedTargetTest, BaseSSLTest):
   def __init__(self, targets):
     BaseSSLTest.__init__(self)
-    utargets = [t for t in targets if self._is_useable_url(t)]
-    FixedTargetTest.__init__(self, targets)
+    utargets = [t for t in targets if self._is_useable_url(t, [''])]
+    FixedTargetTest.__init__(self, utargets)
 
 # Search Based Tests
 class SearchBasedTest:
-- 
1.7.1