diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-11-27 14:36:21 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-11-28 14:44:11 +0100 |
| commit | 576e85ad99ca94ae0a23d7cc2f054d43c9aefbb3 (patch) | |
| tree | 1432aa5054621b3b62e6e9a2077cd255591f5963 | |
| parent | 96c6b2b64926b7c2d57ce0a85d11039d062dfc3b (diff) | |
| download | mariadb-git-576e85ad99ca94ae0a23d7cc2f054d43c9aefbb3.tar.gz | |
fix ssl_crl test failures on newer OpenSSL
generalize the replacement
| -rw-r--r-- | mysql-test/main/ssl_crl.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/ssl_crl.test b/mysql-test/main/ssl_crl.test index dc30a9b5934..e79f8ff32c2 100644 --- a/mysql-test/main/ssl_crl.test +++ b/mysql-test/main/ssl_crl.test @@ -7,7 +7,7 @@ --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/server-new-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/server-new-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" --echo # try logging in with a certificate in the server's --ssl-crl : should fail -# OpenSSL 1.1.1a correctly rejects the certificate, but the error message is wrong ---replace_result "ERROR 2013 (HY000): Lost connection to MySQL server at 'reading authorization packet', system error: 0" "ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked" +# OpenSSL 1.1.1a correctly rejects the certificate, but the error message is different +--replace_regex /ERROR 2013 \(HY000\): Lost connection to MySQL server at '.*', system error: [0-9]+/ERROR 2026 (HY000): SSL connection error: sslv3 alert certificate revoked/ --error 1 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_version'" 2>&1 |