[tor-commits] [ooni-probe/develop] Create a host attribute for storing the --host option, and set self.ciphers.

[isis@xxxxxxxxxxxxxx]

commit 06b8f411d6d3bcfe45ea466827e0e12ac6dbac74
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Mon Apr 22 00:26:31 2013 +0000

    Create a host attribute for storing the --host option, and set self.ciphers.
    
     * self.ciphers should exist even if we didn't recieve any localOptions from
       the runner.
---
 nettests/experimental/tls_handshake.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py
index 92d9009..35955dc 100644
--- a/nettests/experimental/tls_handshake.py
+++ b/nettests/experimental/tls_handshake.py
@@ -138,9 +138,13 @@ class HandshakeTest(nettest.NetTestCase):
     context = SSL.Context(SSL.TLSv1_METHOD)
 
     def setUp(self, *args, **kwargs):
+        """Set defaults for a :class:`HandshakeTest <HandshakeTest>`."""
+
+        self.host = None
+        self.ciphers = list()
+
         if self.localOptions:
             options = self.localOptions
-            self.ciphers = []
 
             ## check that we're testing an IP:PORT, else exit gracefully:
             if not ((options['host'] and options['port']) or options['file']):



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits