mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
move encryption tests to a dedicate suite
remove few tests for variables that never existed (merge error)
This commit is contained in:
Sergei Golubchik
@ -1,5 +0,0 @@
|
||||
[cbc]
|
||||
file-key-management-encryption-algorithm=aes_cbc
|
||||
|
||||
[ctr]
|
||||
file-key-management-encryption-algorithm=aes_ctr
|
||||
@ -1,3 +0,0 @@
|
||||
#
|
||||
# See suite.pm for the actual check
|
||||
#
|
||||
@ -1,4 +0,0 @@
|
||||
--plugin-load-add=$FILE_KEY_MANAGEMENT_SO
|
||||
--loose-file-key-management
|
||||
--loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
#
|
||||
# Ensure we have innodb encryption incompiled
|
||||
|
||||
if (`select count(*)=0 from information_schema.global_variables where variable_name="innodb_data_encryption_providertype"`)
|
||||
{
|
||||
--skip Test requires InnoDB encryption.
|
||||
}
|
||||
@ -171,6 +171,7 @@ my @DEFAULT_SUITES= qw(
|
||||
archive-
|
||||
binlog-
|
||||
csv-
|
||||
encryption-
|
||||
federated-
|
||||
funcs_1-
|
||||
funcs_2-
|
||||
|
||||
@ -66,10 +66,6 @@ sub skip_combinations {
|
||||
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
|
||||
and $1 ge "1.0.1";
|
||||
|
||||
$skip{'include/encryption_algorithms.combinations'} = [ 'ctr' ]
|
||||
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
|
||||
and $1 ge "1.0.1";
|
||||
|
||||
%skip;
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
[cbc]
|
||||
plugin-load-add=$FILE_KEY_MANAGEMENT_SO
|
||||
loose-file-key-management
|
||||
loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt
|
||||
file-key-management-encryption-algorithm=aes_cbc
|
||||
|
||||
[ctr]
|
||||
plugin-load-add=$FILE_KEY_MANAGEMENT_SO
|
||||
loose-file-key-management
|
||||
loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt
|
||||
file-key-management-encryption-algorithm=aes_ctr
|
||||
16
mysql-test/suite/encryption/suite.pm
Normal file
16
mysql-test/suite/encryption/suite.pm
Normal file
@ -0,0 +1,16 @@
|
||||
package My::Suite::Encryption;
|
||||
|
||||
@ISA = qw(My::Suite);
|
||||
|
||||
sub skip_combinations {
|
||||
my @combinations;
|
||||
|
||||
$skip{'include/have_file_key_management_plugin.combinations'} = [ 'ctr' ]
|
||||
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
|
||||
and $1 ge "1.0.1";
|
||||
|
||||
%skip;
|
||||
}
|
||||
|
||||
bless { };
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
--source encryption_algorithms.inc
|
||||
|
||||
if (!$FILE_KEY_MANAGEMENT_SO)
|
||||
{
|
||||
--skip Needs file_key_management
|
||||
@ -1,9 +0,0 @@
|
||||
SELECT @start_data_encryption_filekey;
|
||||
@start_data_encryption_filekey
|
||||
NULL
|
||||
SELECT COUNT(@@GLOBAL.innodb_data_encryption_filekey);
|
||||
COUNT(@@GLOBAL.innodb_data_encryption_filekey)
|
||||
0
|
||||
1 Expected
|
||||
SET @@GLOBAL.innodb_data_encryption_filekey='secret';
|
||||
ERROR HY000: Variable 'innodb_data_encryption_filekey' is a read only variable
|
||||
@ -1,9 +0,0 @@
|
||||
SELECT @start_data_encryption_providername;
|
||||
@start_data_encryption_providername
|
||||
NULL
|
||||
SELECT COUNT(@@GLOBAL.innodb_data_encryption_providername);
|
||||
COUNT(@@GLOBAL.innodb_data_encryption_providername)
|
||||
0
|
||||
1 Expected
|
||||
SET @@GLOBAL.innodb_data_encryption_providername='key.txt';
|
||||
ERROR HY000: Variable 'innodb_data_encryption_providername' is a read only variable
|
||||
@ -1,11 +0,0 @@
|
||||
SELECT @start_data_encryption_providertype;
|
||||
@start_data_encryption_providertype
|
||||
NULL
|
||||
SELECT COUNT(@@GLOBAL.innodb_data_encryption_providertype);
|
||||
COUNT(@@GLOBAL.innodb_data_encryption_providertype)
|
||||
1
|
||||
1 Expected
|
||||
SET @@GLOBAL.innodb_data_encryption_providertype=1;
|
||||
ERROR HY000: Variable 'innodb_data_encryption_providertype' is a read only variable
|
||||
SET @@GLOBAL.innodb_data_encryption_providertype=k;
|
||||
ERROR HY000: Variable 'innodb_data_encryption_providertype' is a read only variable
|
||||
@ -1,9 +0,0 @@
|
||||
SELECT @start_data_encryption_providerurl;
|
||||
@start_data_encryption_providerurl
|
||||
NULL
|
||||
SELECT COUNT(@@GLOBAL.innodb_data_encryption_providerurl);
|
||||
COUNT(@@GLOBAL.innodb_data_encryption_providerurl)
|
||||
0
|
||||
1 Expected
|
||||
SET @@GLOBAL.innodb_data_encryption_providerurl='http://www.google.com';
|
||||
ERROR HY000: Variable 'innodb_data_encryption_providerurl' is a read only variable
|
||||
@ -1,14 +0,0 @@
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_innodb_encryption.inc
|
||||
|
||||
SELECT @start_data_encryption_filekey;
|
||||
|
||||
SELECT COUNT(@@GLOBAL.innodb_data_encryption_filekey);
|
||||
--echo 1 Expected
|
||||
|
||||
# This variable is read only variable
|
||||
--error 1238
|
||||
SET @@GLOBAL.innodb_data_encryption_filekey='secret';
|
||||
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_innodb_encryption.inc
|
||||
|
||||
SELECT @start_data_encryption_providername;
|
||||
|
||||
SELECT COUNT(@@GLOBAL.innodb_data_encryption_providername);
|
||||
--echo 1 Expected
|
||||
|
||||
# This variable is read only variable
|
||||
--error 1238
|
||||
SET @@GLOBAL.innodb_data_encryption_providername='key.txt';
|
||||
@ -1,16 +0,0 @@
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_innodb_encryption.inc
|
||||
|
||||
SELECT @start_data_encryption_providertype;
|
||||
|
||||
SELECT COUNT(@@GLOBAL.innodb_data_encryption_providertype);
|
||||
--echo 1 Expected
|
||||
|
||||
# This variable is read only variable
|
||||
--error 1238
|
||||
SET @@GLOBAL.innodb_data_encryption_providertype=1;
|
||||
|
||||
# This variable is read only variable
|
||||
--error 1238
|
||||
SET @@GLOBAL.innodb_data_encryption_providertype=k;
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_innodb_encryption.inc
|
||||
|
||||
SELECT @start_data_encryption_providerurl;
|
||||
|
||||
SELECT COUNT(@@GLOBAL.innodb_data_encryption_providerurl);
|
||||
--echo 1 Expected
|
||||
|
||||
# This variable is read only variable
|
||||
--error 1238
|
||||
SET @@GLOBAL.innodb_data_encryption_providerurl='http://www.google.com';
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user