Skip to content

Commit 189be0d

Browse files
committed
Fix minor SSL UT behaviour.
1 parent 1fed733 commit 189be0d

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

devapi/tests/session-t.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@ TEST_F(Sess, ssl_session)
11881188
{
11891189
opts.set(
11901190
SessionOption::SSL_MODE, SSLMode::DISABLED,
1191-
SessionOption::SSL_CA, ssl_ca
1191+
SessionOption::SSL_CA, "BAD"
11921192
);
11931193
mysqlx::Session sess(opts);
11941194
check_ssl(sess, false);

xapi/tests/xapi-t.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,8 +1497,6 @@ TEST_F(xapi, conn_options_test)
14971497
EXPECT_EQ(RESULT_OK, mysqlx_session_option_set(opt1,
14981498
OPT_SSL_CA(ca.c_str()), PARAM_END
14991499
));
1500-
cout << "Expected error: "
1501-
<< mysqlx_error_message(mysqlx_error(opt1)) << std::endl;
15021500
}
15031501

15041502
mysqlx_free(opt1);
@@ -1599,8 +1597,8 @@ TEST_F(xapi, conn_options_atomic)
15991597
EXPECT_STREQ(test_db2, buf);
16001598
EXPECT_EQ(RESULT_OK, mysqlx_session_option_get(opt, MYSQLX_OPT_SSL_MODE, &ssl_mode));
16011599
EXPECT_EQ(true, SSL_MODE_DISABLED == ssl_mode);
1602-
// the SSL_CA option was not set in the end, so can't read it
16031600
EXPECT_EQ(RESULT_OK, mysqlx_session_option_get(opt, MYSQLX_OPT_SSL_CA, buf));
1601+
EXPECT_STREQ("ca.pem", buf);
16041602

16051603
mysqlx_free(opt);
16061604
}

0 commit comments

Comments
 (0)