Skip to content

Commit 5d57e2d

Browse files
cvicentiucvicentiu
committed
Fix tests for 7937
1 parent be5035b commit 5d57e2d

File tree

6 files changed

+4
-22
lines changed

6 files changed

+4
-22
lines changed

‎mysql-test/include/have_ssl_disabled.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- require r/have_ssl_disabled.require
2-
disable_query_log;
3-
show variables like 'have_ssl';
4-
enable_query_log;
1+
if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME like 'have_ssl' and VARIABLE_VALUE like 'DISABLED'`)
2+
{
3+
--skip Test requires ssl to be disabled.
4+
}

‎mysql-test/r/have_ssl_disabled.require

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎mysql-test/r/ssl_7937.result

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
21
Variable_name Value
32
Ssl_cipher DHE-RSA-AES256-GCM-SHA384
43
#
5-
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
64
Variable_name Value
75
Ssl_cipher DHE-RSA-AES256-GCM-SHA384
86
#
9-
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
107
ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate
118
#
12-
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
139
ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate

‎mysql-test/r/ssl_without_7937.result

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
21
Variable_name Value
32
Ssl_cipher
4-
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
53
ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it
6-
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
74
Variable_name Value
85
Ssl_cipher
9-
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
106
ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it

‎mysql-test/t/ssl_7937.test

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@ let $mysql_ssl_no_cert=$MYSQL --ssl -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
55
let $mysql_ssl_no_cert_ver=$MYSQL --ssl --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
66
let $mysql_ssl_cert_ver=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
77

8-
--echo $mysql_ssl_cert;
98
--exec $mysql_ssl_cert;
109
--echo #
11-
--echo $mysql_ssl_no_cert;
1210
--exec $mysql_ssl_no_cert;
1311
--echo #
14-
--echo $mysql_ssl_no_cert_ver;
1512
--error 1
1613
--exec $mysql_ssl_no_cert_ver;
1714
--echo #
18-
--echo $mysql_ssl_cert_ver;
1915
--error 1
2016
--exec $mysql_ssl_cert_ver;
2117

‎mysql-test/t/ssl_without_7937.test

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@ source include/have_ssl_disabled.inc;
44
let $mysql_ssl_cert=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
55
# SSL mandatory with verify server cert
66
let $mysql_ssl_cert_ver=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
7-
--echo $mysql_ssl_cert;
87
--exec $mysql_ssl_cert;
9-
--echo $mysql_ssl_cert_ver;
108
--error 1
119
--exec $mysql_ssl_cert_ver;
1210

1311
# SSL not mandatory again
1412
let $mysql_no_ssl_but_ver=$MYSQL --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
15-
--echo $mysql_no_ssl_but_ver;
1613
--exec $mysql_no_ssl_but_ver;
1714

1815
# SSL mandatory but no specifications for ssl parameters
1916
let $mysql_ssl_no_spec_ver=$MYSQL --ssl --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
20-
--echo $mysql_ssl_no_spec_ver
2117
--error 1
2218
--exec $mysql_ssl_no_spec_ver

0 commit comments

Comments
 (0)