Skip to content

Commit 72b4b86

Browse files
committed
Fix TLS UT on non TLSv1.3 openssl
Change-Id: I129629a067ca8ff6e8c08f8b61129afedba51de4
1 parent 4cfafef commit 72b4b86

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

devapi/tests/session-t.cc

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4066,14 +4066,8 @@ TEST_F(Sess, tls_ver_deprecate)
40664066

40674067
std::cout << "Testing:" << test.tls_versions << std::endl;
40684068

4069-
{
4070-
SessionSettings opt(SessionOption::HOST, get_host(),
4071-
SessionOption::PORT, get_port(),
4072-
SessionOption::USER, get_user(),
4073-
SessionOption::PWD, get_password(),
4074-
SessionOption::SSL_MODE, SSLMode::REQUIRED);
4075-
EXPECT_EQ(test.succeed, check_tls_ver(test.tls_versions.c_str()));
4076-
}
4069+
EXPECT_EQ(test.succeed, check_tls_ver(test.tls_versions.c_str()));
4070+
40774071
//URI
40784072
std::stringstream uri;
40794073
uri << get_uri() << "/?tls-versions=[" << test.tls_versions << "]";
@@ -4088,7 +4082,8 @@ TEST_F(Sess, tls_ver_deprecate)
40884082
mysqlx::Session(uri.str());
40894083

40904084
} catch (const std::exception& e) {
4091-
EXPECT_EQ(std::string(e.what()), "No valid TLS version was given, valid versions are: TLSv1.2, TLSv1.3");
4085+
if (has_tlsv1_3)
4086+
EXPECT_EQ(std::string(e.what()), "No valid TLS version was given, valid versions are: TLSv1.2, TLSv1.3");
40924087
}
40934088
}
40944089
}

0 commit comments

Comments
 (0)