Skip to content

Commit 238cf5e

Browse files
committed
align native_transport_ssl_test with CASSANDRA-19397
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-19397
1 parent 26b939d commit 238cf5e

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

native_transport_ssl_test.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,20 @@ def test_use_custom_ssl_port(self):
9191
Connect to additional ssl enabled native transport port
9292
@jira_ticket CASSANDRA-9590
9393
"""
94-
cluster = self._populateCluster(enableSSL=True, nativePortSSL=9666)
94+
95+
# native_transport_port_ssl was removed in CASSANDRA-19397
96+
if self.cluster.version() > '5.0':
97+
cluster = self._populateCluster(enableSSL=True, nativePort=9666)
98+
else:
99+
cluster = self._populateCluster(enableSSL=True, nativePortSSL=9666)
100+
95101
node1 = cluster.nodelist()[0]
96102
cluster.start()
97103

98-
# we should be able to connect to default non-ssl port
99-
session = self.patient_cql_connection(node1)
100-
self._putget(cluster, session)
104+
if self.cluster.version() <= '5.0':
105+
# we should be able to connect to default non-ssl port
106+
session = self.patient_cql_connection(node1)
107+
self._putget(cluster, session)
101108

102109
# connect to additional dedicated ssl port
103110
session = self.patient_cql_connection(node1, port=9666, ssl_opts={'ca_certs': os.path.join(self.fixture_dtest_setup.test_path, 'ccm_node.cer')})

0 commit comments

Comments
 (0)