[tor-commits] [ooni-probe/develop] Fix an error in the commandline options parsing which allowed commandline host

[isis at torproject.org]

commit ac8824101fb99e5fd06e03d36bac1ffe7d03293d
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu Feb 28 01:49:57 2013 +0000

    Fix an error in the commandline options parsing which allowed commandline host
    IP:port inputs in addition to a file of inputs, which would throw off the
    input_id counter and mess up reporting.
---
 nettests/experimental/tls_handshake.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py
index fc673cb..7f3c8ad 100644
--- a/nettests/experimental/tls_handshake.py
+++ b/nettests/experimental/tls_handshake.py
@@ -103,10 +103,8 @@ class TLSHandshakeTest(nettest.NetTestCase):
             self.ciphers = []
             self.methods = []
 
-            ## check that we're actually testing an IP:PORT, else exit
-            ## gracefully:
-            if not (options['host'] and options['port']) \
-                    and not options['file']:
+            ## check that we're testing an IP:PORT, else exit gracefully:
+            if not ((options['host'] and options['port']) or options['file']):
                  sys.exit("Need --host and --port, or --file!")
 
             ## set the SSL/TLS method to use: