This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new c72f696 Add TLS test for cqlsh patch by Brandon Williams, reviewed by
Ekaterina Dimitrova, Adam Holmberg and David Capwell for CASSANDRA-16695
c72f696 is described below
commit c72f6960caf2ec723bddec59030ab6679b6c63a4
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Jun 11 16:03:51 2021 -0500
Add TLS test for cqlsh
patch by Brandon Williams, reviewed by Ekaterina Dimitrova, Adam Holmberg
and David Capwell for CASSANDRA-16695
---
cqlsh_tests/test_cqlsh.py | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py
index 8a2a98e..78bde3a 100644
--- a/cqlsh_tests/test_cqlsh.py
+++ b/cqlsh_tests/test_cqlsh.py
@@ -29,7 +29,8 @@ from dtest import Tester, create_ks, create_cf
from dtest_setup_overrides import DTestSetupOverrides
from tools.assertions import assert_all, assert_none
from tools.data import create_c1c2_table, insert_c1c2, rows_to_list
-from tools.misc import ImmutableMapping
+from tools.misc import ImmutableMapping, generate_ssl_stores
+
from . import util
since = pytest.mark.since
@@ -171,6 +172,28 @@ class TestCqlsh(Tester, CqlshMixin):
assert {1: 'one', 2: 'two', 3: 'three', 4: 'four', 5: 'five'} == {k: v
for k, v in rows}
+ def test_tls(self):
+ """ Test that TLSv1.2 connections work CASSANDRA-16695 """
+ generate_ssl_stores(self.fixture_dtest_setup.test_path)
+ self.cluster.set_configuration_options({
+ 'client_encryption_options': {
+ 'enabled': True,
+ 'optional': False,
+ 'protocol': 'TLSv1.2',
+ 'keystore': os.path.join(self.fixture_dtest_setup.test_path,
'keystore.jks'),
+ 'keystore_password': 'cassandra'
+ }
+ })
+
+ self.cluster.populate(1)
+ self.cluster.start()
+
+ node1, = self.cluster.nodelist()
+
+ out, err = self.run_cqlsh(node1, cmds="DESCRIBE KEYSPACES",
cqlsh_options=['--ssl'], env_vars={'SSL_CERTFILE':
os.path.join(self.fixture_dtest_setup.test_path, 'ccm_node.cer')})
+ assert err == ''
+
+
def test_lwt(self):
"""
Test LWT inserts and updates.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
