diff options
| author | unknown <paul@ice.snake.net> | 2003-07-16 23:47:48 -0500 |
|---|---|---|
| committer | unknown <paul@ice.snake.net> | 2003-07-16 23:47:48 -0500 |
| commit | 7a3a6aebc765af300d08c014032d962ba9cc3ce4 (patch) | |
| tree | 4afb46dfd937b626e39920bb31eaca209f386c28 | |
| parent | 7770c16770aca0d0224697ea2c9ede07209b78a5 (diff) | |
| download | mariadb-git-7a3a6aebc765af300d08c014032d962ba9cc3ce4.tar.gz | |
Fix openssl_2 test so it passes or fails. (It was being reported
as [skipped], even when run explicitly.)
mysql-test/include/have_openssl_2.inc:
There is no such variable as SSL_get_cipher.
mysql-test/r/have_openssl_2.require:
Require file required garbage. Fix to require something sensible.
mysql-test/r/openssl_2.result:
Add output of SHOW STATUS to test result.
mysql-test/t/openssl_2.test:
Use actual lettercase of SSL status variables.
(Test will work with uppercase, but there's no
reason not to use the actual lettercase.)
| -rw-r--r-- | mysql-test/include/have_openssl_2.inc | 2 | ||||
| -rw-r--r-- | mysql-test/r/have_openssl_2.require | 2 | ||||
| -rw-r--r-- | mysql-test/r/openssl_2.result | 25 | ||||
| -rw-r--r-- | mysql-test/t/openssl_2.test | 2 |
4 files changed, 27 insertions, 4 deletions
diff --git a/mysql-test/include/have_openssl_2.inc b/mysql-test/include/have_openssl_2.inc index 724d295a398..9671ce29573 100644 --- a/mysql-test/include/have_openssl_2.inc +++ b/mysql-test/include/have_openssl_2.inc @@ -1,4 +1,4 @@ -- require r/have_openssl_2.require disable_query_log; -SHOW STATUS LIKE "SSL_get_cipher"; +SHOW STATUS LIKE "Ssl_cipher"; enable_query_log; diff --git a/mysql-test/r/have_openssl_2.require b/mysql-test/r/have_openssl_2.require index 09a65d7d9bc..032b60d544a 100644 --- a/mysql-test/r/have_openssl_2.require +++ b/mysql-test/r/have_openssl_2.require @@ -1,2 +1,2 @@ Variable_name Value -jkhjkhfs +Ssl_cipher EDH-RSA-DES-CBC3-SHA diff --git a/mysql-test/r/openssl_2.result b/mysql-test/r/openssl_2.result index b5c67dfbcb0..879c623dd40 100644 --- a/mysql-test/r/openssl_2.result +++ b/mysql-test/r/openssl_2.result @@ -1,2 +1,25 @@ -SHOW STATUS LIKE 'SSL%'; +SHOW STATUS LIKE 'Ssl%'; Variable_name Value +Ssl_accepts 1 +Ssl_finished_accepts 1 +Ssl_finished_connects 0 +Ssl_accept_renegotiates 0 +Ssl_connect_renegotiates 0 +Ssl_callback_cache_hits 0 +Ssl_session_cache_hits 0 +Ssl_session_cache_misses 0 +Ssl_session_cache_timeouts 0 +Ssl_used_session_cache_entries 1 +Ssl_client_connects 0 +Ssl_session_cache_overflows 0 +Ssl_session_cache_size 128 +Ssl_session_cache_mode SERVER +Ssl_sessions_reused 0 +Ssl_ctx_verify_mode 7 +Ssl_ctx_verify_depth 4294967295 +Ssl_verify_mode 7 +Ssl_verify_depth 4294967295 +Ssl_version TLSv1 +Ssl_cipher EDH-RSA-DES-CBC3-SHA +Ssl_cipher_list +Ssl_default_timeout 7200 diff --git a/mysql-test/t/openssl_2.test b/mysql-test/t/openssl_2.test index 12f1240f3af..a8ee62db7f6 100644 --- a/mysql-test/t/openssl_2.test +++ b/mysql-test/t/openssl_2.test @@ -1,5 +1,5 @@ # We want to test everything with SSL turned on. -- source include/have_openssl_2.inc -SHOW STATUS LIKE 'SSL%'; +SHOW STATUS LIKE 'Ssl%'; |