Address review comments, change variable naming

Author: csstaub

tests/test-client-handles-client-closes-connection.py

@@ -8,7 +8,7 @@
 
 ghostunnel = None
 try:
-    __root__ = create_default_certs()
+    _root = create_default_certs()  # keep RootCert alive for cert lifecycle
     ghostunnel = start_ghostunnel_client(extra_args=['--close-timeout=10s'])
 
     # connect to server, confirm that the tunnel is up

tests/test-client-handles-no-server.py

@@ -8,13 +8,13 @@
 
 ghostunnel = None
 try:
-    __root__ = create_default_certs()
+    _root = create_default_certs()  # keep RootCert alive for cert lifecycle
     ghostunnel = start_ghostunnel_client()
 
     # client should fail to connect since nothing is listening on wrong_port
     wrong_port = get_free_port()
     try:
-        _pair = SocketPair(TcpClient(LISTEN_PORT), TlsServer(
+        SocketPair(TcpClient(LISTEN_PORT), TlsServer(
             'server', 'root', wrong_port))
         raise Exception('client should have failed to connect')
     except TimeoutError:

tests/test-client-handles-server-closes-connection.py

@@ -8,7 +8,7 @@
 
 ghostunnel = None
 try:
-    __root__ = create_default_certs()
+    _root = create_default_certs()  # keep RootCert alive for cert lifecycle
     ghostunnel = start_ghostunnel_client(extra_args=['--close-timeout=10s'])
 
     # connect with client, confirm that the tunnel is up

tests/test-mutually-exclusive-client-flags.py

@@ -2,6 +2,11 @@
 
 from common import LOCALHOST, RootCert, run_ghostunnel, terminate, assert_not_zero, LISTEN_PORT, TARGET_PORT
 
+ghostunnel1 = None
+ghostunnel2 = None
+ghostunnel3 = None
+ghostunnel4 = None
+ghostunnel5 = None
 try:
     # create certs
     root = RootCert('root')

tests/test-mutually-exclusive-server-flags.py

@@ -2,6 +2,12 @@
 
 from common import LOCALHOST, RootCert, run_ghostunnel, terminate, assert_not_zero, LISTEN_PORT, TARGET_PORT
 
+ghostunnel1 = None
+ghostunnel2 = None
+ghostunnel3 = None
+ghostunnel4 = None
+ghostunnel5 = None
+ghostunnel6 = None
 try:
     # create certs
     root = RootCert('root')

tests/test-server-disable-authentication.py

@@ -49,7 +49,7 @@
 
     # connect with client2, confirm that the tunnel isn't up
     try:
-        _pair = SocketPair(
+        SocketPair(
             TlsClient('client2', 'root', LISTEN_PORT), TcpServer(TARGET_PORT))
     except ssl.SSLError as err:
         raise Exception(

tests/test-server-handles-client-closes-connection.py

@@ -8,7 +8,7 @@
 
 ghostunnel = None
 try:
-    __root__ = create_default_certs()
+    _root = create_default_certs()  # keep RootCert alive for cert lifecycle
     ghostunnel = start_ghostunnel_server(extra_args=['--close-timeout=10s'])
 
     # connect with client, confirm that the tunnel is up

tests/test-server-handles-no-server.py

@@ -8,13 +8,13 @@
 
 ghostunnel = None
 try:
-    __root__ = create_default_certs()
+    _root = create_default_certs()  # keep RootCert alive for cert lifecycle
     ghostunnel = start_ghostunnel_server()
 
     # client should fail to connect since nothing is listening on wrong_port
     wrong_port = get_free_port()
     try:
-        _pair = SocketPair(
+        SocketPair(
             TlsClient('client', 'root', LISTEN_PORT), TcpServer(wrong_port))
         raise Exception('client should have failed to connect')
     except TimeoutError:

tests/test-server-handles-server-closes-connection.py

@@ -8,7 +8,7 @@
 
 ghostunnel = None
 try:
-    __root__ = create_default_certs()
+    _root = create_default_certs()  # keep RootCert alive for cert lifecycle
     ghostunnel = start_ghostunnel_server(extra_args=['--close-timeout=10s'])
 
     # connect with client, confirm that the tunnel is up

tests/test-server-quiet-conn-logs.py

@@ -54,7 +54,7 @@
     print(err)
 
     if 'opening pipe' in err.decode('utf-8'):
-        raise Exception('ghostunnel logged connection log to stderr with --quiet=all')
+        raise Exception('ghostunnel logged connection log to stderr with --quiet=conns')
 
     print_ok('OK')
 finally: