[tor-commits] [ooni-probe/master] Fix tls_handshake input processing

[art at torproject.org]

commit 50cf01773f820354a01cdc3681cc6e03b2f0729b
Author: aagbsn <aagbsn at extc.org>
Date:   Tue Apr 30 19:32:33 2013 +0800

    Fix tls_handshake input processing
---
 nettests/experimental/tls_handshake.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py
index 666e961..83b2868 100644
--- a/nettests/experimental/tls_handshake.py
+++ b/nettests/experimental/tls_handshake.py
@@ -133,6 +133,7 @@ class HandshakeTest(nettest.NetTestCase):
     requiresRoot = False
     usageOptions = HandshakeOptions
 
+    host = None
     inputFile = ['file', 'f', None, 'List of <IP>:<PORT>s to test']
 
     #: Default SSL/TLS context method.
@@ -141,7 +142,6 @@ class HandshakeTest(nettest.NetTestCase):
     def setUp(self, *args, **kwargs):
         """Set defaults for a :class:`HandshakeTest <HandshakeTest>`."""
 
-        self.host = None
         self.ciphers = list()
 
         if self.localOptions:
@@ -772,11 +772,9 @@ class HandshakeTest(nettest.NetTestCase):
         def deferMakeConnection(host):
             return threads.deferToThread(makeConnection, self.input)
 
-
-        log.msg("Beginning handshake test for %s" % (self.input or self.host))
-
         if self.host and not self.input:
             self.input = self.splitInput(self.host)
+        log.msg("Beginning handshake test for %s:%s" % self.input)
 
         connection = deferMakeConnection(self.input)
         connection.addCallbacks(connectionSucceeded, connectionFailed,