Fix migration bugs

Author: uglide

.gitignore

@@ -19,3 +19,7 @@ coverage.xml
 prof
 profile_output*
 docker/stunnel/keys
+/dockers/*/node-*/*
+/dockers/*/tls/*
+/dockers/standalone/
+/dockers/cluster/

docker-compose.yml

@@ -6,10 +6,11 @@ services:
     image: redislabs/client-libs-test:8.0-M01
     container_name: redis-standalone
     environment:
-      - REDIS_TLS_ENABLED=yes
+      - TLS_ENABLED=yes
+      - REDIS_CLUSTER=no
       - PORT=6379
       - TLS_PORT=6666
-      - REDIS_DIRECTIVES=--enable-debug-command yes
+    command: --enable-debug-command yes --tls-auth-clients optional
     ports:
       - 6379:6379
       - 6666:6666 # TLS port
@@ -42,7 +43,7 @@ services:
       - TLS_ENABLED=yes
       - PORT=16379
       - TLS_PORT=17379
-      - REDIS_DIRECTIVES=--tls-auth-clients optional
+    command: --tls-auth-clients optional
     ports:
       - "16379-16384:16379-16384"
       - "17379-17384:17379-17384"

tests/test_asyncio/test_connect.py

@@ -57,17 +57,21 @@ async def test_uds_connect(uds_address):
 )
 async def test_tcp_ssl_tls12_custom_ciphers(tcp_address, ssl_ciphers):
     host, port = tcp_address
-    certfile, keyfile, ca_certfile = get_tls_certificates()
+
+    server_certs = get_tls_certificates(cert_type=CertificateType.server)
+
     conn = SSLConnection(
         host=host,
         port=port,
         client_name=_CLIENT_NAME,
-        ssl_ca_certs=ca_certfile,
+        ssl_ca_certs=server_certs.ca_certfile,
         socket_timeout=10,
         ssl_min_version=ssl.TLSVersion.TLSv1_2,
         ssl_ciphers=ssl_ciphers,
     )
-    await _assert_connect(conn, tcp_address, certfile=certfile, keyfile=keyfile)
+    await _assert_connect(
+        conn, tcp_address, certfile=server_certs.certfile, keyfile=server_certs.keyfile
+    )
     await conn.disconnect()
 
 
@@ -85,17 +89,19 @@ async def test_tcp_ssl_tls12_custom_ciphers(tcp_address, ssl_ciphers):
 async def test_tcp_ssl_connect(tcp_address, ssl_min_version):
     host, port = tcp_address
 
-    certfile, keyfile, ca_certfile = get_tls_certificates()
+    server_certs = get_tls_certificates(cert_type=CertificateType.server)
 
     conn = SSLConnection(
         host=host,
         port=port,
         client_name=_CLIENT_NAME,
-        ssl_ca_certs=ca_certfile,
+        ssl_ca_certs=server_certs.ca_certfile,
         socket_timeout=10,
         ssl_min_version=ssl_min_version,
     )
-    await _assert_connect(conn, tcp_address, certfile=certfile, keyfile=keyfile)
+    await _assert_connect(
+        conn, tcp_address, certfile=server_certs.certfile, keyfile=server_certs.keyfile
+    )
     await conn.disconnect()
 
 

tests/test_connect.py

@@ -54,16 +54,18 @@ def test_uds_connect(uds_address):
 )
 def test_tcp_ssl_connect(tcp_address, ssl_min_version):
     host, port = tcp_address
-    certfile, keyfile, ca_certfile = get_tls_certificates()
+    server_certs = get_tls_certificates(cert_type=CertificateType.server)
     conn = SSLConnection(
         host=host,
         port=port,
         client_name=_CLIENT_NAME,
-        ssl_ca_certs=ca_certfile,
+        ssl_ca_certs=server_certs.ca_certfile,
         socket_timeout=10,
         ssl_min_version=ssl_min_version,
     )
-    _assert_connect(conn, tcp_address, certfile=certfile, keyfile=keyfile)
+    _assert_connect(
+        conn, tcp_address, certfile=server_certs.certfile, keyfile=server_certs.keyfile
+    )
 
 
 @pytest.mark.ssl
@@ -77,17 +79,21 @@ def test_tcp_ssl_connect(tcp_address, ssl_min_version):
 )
 def test_tcp_ssl_tls12_custom_ciphers(tcp_address, ssl_ciphers):
     host, port = tcp_address
-    certfile, keyfile, ca_certfile = get_tls_certificates()
+
+    server_certs = get_tls_certificates(cert_type=CertificateType.server)
+
     conn = SSLConnection(
         host=host,
         port=port,
         client_name=_CLIENT_NAME,
-        ssl_ca_certs=ca_certfile,
+        ssl_ca_certs=server_certs.ca_certfile,
         socket_timeout=10,
         ssl_min_version=ssl.TLSVersion.TLSv1_2,
         ssl_ciphers=ssl_ciphers,
     )
-    _assert_connect(conn, tcp_address, certfile=certfile, keyfile=keyfile)
+    _assert_connect(
+        conn, tcp_address, certfile=server_certs.certfile, keyfile=server_certs.keyfile
+    )
 
 
 """

tests/test_ssl.py

@@ -55,7 +55,7 @@ def test_validating_self_signed_certificate(self, request):
             host=p[0],
             port=p[1],
             ssl=True,
-            ssl_certfile=self.client_certs.cert,
+            ssl_certfile=self.client_certs.certfile,
             ssl_keyfile=self.client_certs.keyfile,
             ssl_cert_reqs="required",
             ssl_ca_certs=self.client_certs.ca_certfile,
@@ -72,7 +72,7 @@ def test_validating_self_signed_string_certificate(self, request):
             host=p[0],
             port=p[1],
             ssl=True,
-            ssl_certfile=self.client_certs.cert,
+            ssl_certfile=self.client_certs.certfile,
             ssl_keyfile=self.client_certs.keyfile,
             ssl_cert_reqs="required",
             ssl_ca_data=cert_data,
@@ -149,7 +149,7 @@ def _create_oscp_conn(self, request):
             host=p[0],
             port=p[1],
             ssl=True,
-            ssl_certfile=self.client_certs.cert,
+            ssl_certfile=self.client_certs.certfile,
             ssl_keyfile=self.client_certs.keyfile,
             ssl_cert_reqs="required",
             ssl_ca_certs=self.client_certs.ca_certfile,