This is an automated email from the ASF dual-hosted git repository.
aleksey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/master by this push:
new a3b607a Fix
native_transport_ssl_test.py::TestNativeTransportSSL::test_connect_to_ssl
a3b607a is described below
commit a3b607a11971a052bb44fd057106632b18201d7e
Author: Aleksey Yeschenko <[email protected]>
AuthorDate: Tue Jul 2 18:49:26 2019 +0100
Fix
native_transport_ssl_test.py::TestNativeTransportSSL::test_connect_to_ssl
---
native_transport_ssl_test.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/native_transport_ssl_test.py b/native_transport_ssl_test.py
index 284617d..50e5e82 100644
--- a/native_transport_ssl_test.py
+++ b/native_transport_ssl_test.py
@@ -34,7 +34,12 @@ class TestNativeTransportSSL(Tester):
except NoHostAvailable:
pass
- assert
len(node1.grep_log("io.netty.handler.ssl.NotSslRecordException.*")), 0 >
"Missing SSL handshake exception while connecting with non-SSL enabled client"
+ if cluster.version() >= '4.0':
+ assert len(node1.grep_log("javax.net.ssl.SSLHandshakeException"))
> 0, \
+ "Missing SSL handshake exception while connecting with
non-SSL enabled client"
+ else:
+ assert
len(node1.grep_log("io.netty.handler.ssl.NotSslRecordException.*")) > 0, \
+ "Missing SSL handshake exception while connecting with
non-SSL enabled client"
# enabled ssl on the client and try again (this should work)
session = self.patient_cql_connection(node1, ssl_opts={'ca_certs':
os.path.join(self.fixture_dtest_setup.test_path, 'ccm_node.cer')})
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
