diff options
author | unknown <knielsen@knielsen-hq.org> | 2010-11-23 07:24:44 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2010-11-23 07:24:44 +0100 |
commit | 7840965db9460e2117c163f3db83aaa247c65203 (patch) | |
tree | 0abe7a155d2f5b86327ac6db19a6a7caf66838af /mysql-test/t | |
parent | a967802ae94e1b0ce75436648446621a381838e7 (diff) | |
download | mariadb-git-7840965db9460e2117c163f3db83aaa247c65203.tar.gz |
Fix test failure with OpenSSL due to different error message than in YaSSL.
Diffstat (limited to 'mysql-test/t')
-rw-r--r-- | mysql-test/t/openssl_1.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test index 8ca70258bc0..8051dd0e866 100644 --- a/mysql-test/t/openssl_1.test +++ b/mysql-test/t/openssl_1.test @@ -73,6 +73,8 @@ drop table t1; # a different cacert # --exec echo "this query should not execute;" > $MYSQLTEST_VARDIR/tmp/test.sql +# Handle that openssl gives different error messages from YaSSL. +--replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/ --error 1 --exec $MYSQL_TEST --ssl-ca=$MYSQL_TEST_DIR/std_data/untrusted-cacert.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 @@ -80,6 +82,7 @@ drop table t1; # Test that we can't open connection to server if we are using # a blank ca # +--replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/ --error 1 --exec $MYSQL_TEST --ssl-ca= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 @@ -87,6 +90,7 @@ drop table t1; # Test that we can't open connection to server if we are using # a nonexistent ca file # +--replace_regex /error:00000005:lib\(0\):func\(0\):DH lib/ASN: bad other signature confirmation/ --error 1 --exec $MYSQL_TEST --ssl-ca=nonexisting_file.pem --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1 |