database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

move encryption tests to a dedicate suite

Browse Source 
remove few tests for variables that never existed (merge error)
This commit is contained in:
Sergei Golubchik
2015-05-09 12:31:53 +02:00
parent b22959903b
commit ab8415d983
85 changed files with 28 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mysql-test/suite/plugins/r/filekeys_encfile.result
View File

@@ -1,38 +0,0 @@
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=1
insert t1 values (12345, repeat('1234567890', 20));
alter table t1 encryption_key_id=2;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2
alter table t1 encryption_key_id=3;
ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2
alter table t1 encryption_key_id=33;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=33
alter table t1 encryption_key_id=4;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=4
drop table t1;

9
mysql-test/suite/plugins/r/filekeys_encfile_bad.result
View File

@@ -1,9 +0,0 @@
call mtr.add_suppression("Cannot decrypt .*filekeys-data.enc. Wrong key");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Cannot decrypt .*filekeys-data.enc. Wrong key/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status

9
mysql-test/suite/plugins/r/filekeys_encfile_badfile.result
View File

@@ -1,9 +0,0 @@
call mtr.add_suppression("File 'bad' not found");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /File 'bad' not found/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status

38
mysql-test/suite/plugins/r/filekeys_encfile_file.result
View File

@@ -1,38 +0,0 @@
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=1
insert t1 values (12345, repeat('1234567890', 20));
alter table t1 encryption_key_id=2;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2
alter table t1 encryption_key_id=3;
ERROR HY000: Can't create table `test`.`#sql-temporary` (errno: 140 "Wrong create options")
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2
alter table t1 encryption_key_id=33;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=33
alter table t1 encryption_key_id=4;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`b` char(200) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=4
drop table t1;

9
mysql-test/suite/plugins/r/filekeys_encfile_no.result
View File

@@ -1,9 +0,0 @@
call mtr.add_suppression("Cannot decrypt .*filekeys-data.enc. Wrong key");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Cannot decrypt .*filekeys-data.enc. Wrong key/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status

9
mysql-test/suite/plugins/r/filekeys_nofile.result
View File

@@ -1,9 +0,0 @@
call mtr.add_suppression("File '' not found");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /File '' not found/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status

129
mysql-test/suite/plugins/r/filekeys_syntax.result
View File

@@ -1,129 +0,0 @@
call mtr.add_suppression("File '.*keys.txt' not found");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /File '.*keys.txt' not found/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
install soname 'file_key_management';
ERROR HY000: Invalid key id at MYSQL_TMP_DIR/keys.txt line 2, column 2
call mtr.add_suppression("File '.*keys.txt' not found");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /File '.*keys.txt' not found/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
call mtr.add_suppression("Invalid key id");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Invalid key id/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
install soname 'file_key_management';
ERROR HY000: Invalid key id at MYSQL_TMP_DIR/keys.txt line 2, column 11
call mtr.add_suppression("Invalid key id");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Invalid key id/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
call mtr.add_suppression("Invalid key id");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Invalid key id/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
install soname 'file_key_management';
ERROR HY000: Invalid key at MYSQL_TMP_DIR/keys.txt line 2, column 47
call mtr.add_suppression("Invalid key id");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Invalid key id/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
call mtr.add_suppression("Invalid key");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Invalid key/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
install soname 'file_key_management';
ERROR HY000: Invalid key at MYSQL_TMP_DIR/keys.txt line 2, column 33
call mtr.add_suppression("Invalid key");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Invalid key/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
call mtr.add_suppression("Invalid key");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Invalid key/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
install soname 'file_key_management';
ERROR HY000: Syntax error at MYSQL_TMP_DIR/keys.txt line 2, column 2
call mtr.add_suppression("Invalid key");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Invalid key/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
call mtr.add_suppression("Syntax error");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Syntax error/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
install soname 'file_key_management';
ERROR HY000: Syntax error at MYSQL_TMP_DIR/keys.txt line 2, column 1
call mtr.add_suppression("Syntax error");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Syntax error/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status
call mtr.add_suppression("Syntax error");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Syntax error/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status

9
mysql-test/suite/plugins/r/filekeys_unencfile.result
View File

@@ -1,9 +0,0 @@
call mtr.add_suppression("Cannot decrypt .*keys.txt. Not encrypted");
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
FOUND /Cannot decrypt .*keys.txt. Not encrypted/ in mysqld.1.err
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';
plugin_status

BIN
mysql-test/suite/plugins/t/filekeys-data.enc
View File

Binary file not shown.

1
mysql-test/suite/plugins/t/filekeys-data.key
View File

@@ -1 +0,0 @@
secret

18
mysql-test/suite/plugins/t/filekeys_badtest.inc
View File

@@ -1,18 +0,0 @@
-- source include/not_embedded.inc
-- source include/have_xtradb.inc
-- source filekeys_plugin.inc
--eval call mtr.add_suppression("$SEARCH_PATTERN")
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
--let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err
--let SEARCH_RANGE= -10000
--source include/search_pattern_in_file.inc
--error ER_CANT_CREATE_TABLE
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
select plugin_status from information_schema.plugins
where plugin_name = 'file_key_management';

2
mysql-test/suite/plugins/t/filekeys_encfile.opt
View File

@@ -1,2 +0,0 @@
--loose-file-key-management-filekey=secret
--loose-file-key-management-filename=$MTR_SUITE_DIR/t/filekeys-data.enc

1
mysql-test/suite/plugins/t/filekeys_encfile.test
View File

@@ -1 +0,0 @@
source filekeys_goodtest.inc;

2
mysql-test/suite/plugins/t/filekeys_encfile_bad.opt
View File

@@ -1,2 +0,0 @@
--loose-file-key-management-filekey=bad
--loose-file-key-management-filename=$MTR_SUITE_DIR/t/filekeys-data.enc

2
mysql-test/suite/plugins/t/filekeys_encfile_bad.test
View File

@@ -1,2 +0,0 @@
let SEARCH_PATTERN=Cannot decrypt .*filekeys-data.enc. Wrong key;
source filekeys_badtest.inc;

2
mysql-test/suite/plugins/t/filekeys_encfile_badfile.opt
View File

@@ -1,2 +0,0 @@
--loose-file-key-management-filekey=FILE:bad
--loose-file-key-management-filename=$MTR_SUITE_DIR/t/filekeys-data.enc

2
mysql-test/suite/plugins/t/filekeys_encfile_badfile.test
View File

@@ -1,2 +0,0 @@
let SEARCH_PATTERN=File 'bad' not found;
source filekeys_badtest.inc;

2
mysql-test/suite/plugins/t/filekeys_encfile_file.opt
View File

@@ -1,2 +0,0 @@
--loose-file-key-management-filekey=FILE:$MTR_SUITE_DIR/t/filekeys-data.key
--loose-file-key-management-filename=$MTR_SUITE_DIR/t/filekeys-data.enc

1
mysql-test/suite/plugins/t/filekeys_encfile_file.test
View File

@@ -1 +0,0 @@
source filekeys_goodtest.inc;

1
mysql-test/suite/plugins/t/filekeys_encfile_no.opt
View File

@@ -1 +0,0 @@
--loose-file-key-management-filename=$MTR_SUITE_DIR/t/filekeys-data.enc

2
mysql-test/suite/plugins/t/filekeys_encfile_no.test
View File

@@ -1,2 +0,0 @@
let SEARCH_PATTERN=Cannot decrypt .*filekeys-data.enc. Wrong key;
source filekeys_badtest.inc;

20
mysql-test/suite/plugins/t/filekeys_goodtest.inc
View File

@@ -1,20 +0,0 @@
-- source include/have_xtradb.inc
-- source filekeys_plugin.inc
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
show create table t1;
insert t1 values (12345, repeat('1234567890', 20));
alter table t1 encryption_key_id=2;
show create table t1;
--replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
--error ER_CANT_CREATE_TABLE
alter table t1 encryption_key_id=3;
show create table t1;
alter table t1 encryption_key_id=33;
show create table t1;
alter table t1 encryption_key_id=4;
show create table t1;
drop table t1;

2
mysql-test/suite/plugins/t/filekeys_nofile.test
View File

@@ -1,2 +0,0 @@
let SEARCH_PATTERN=File '' not found;
source filekeys_badtest.inc;

4
mysql-test/suite/plugins/t/filekeys_plugin.inc
View File

@@ -1,4 +0,0 @@
if (!$FILE_KEY_MANAGEMENT_SO)
{
--skip Needs file_key_management
}

1
mysql-test/suite/plugins/t/filekeys_plugin.opt
View File

@@ -1 +0,0 @@
--plugin-load-add=$FILE_KEY_MANAGEMENT_SO

1
mysql-test/suite/plugins/t/filekeys_syntax.opt
View File

@@ -1 +0,0 @@
--loose-file-key-management-filename=$MYSQL_TMP_DIR/keys.txt

96
mysql-test/suite/plugins/t/filekeys_syntax.test
View File

@@ -1,96 +0,0 @@
#
# first test - missing key file
#
let SEARCH_PATTERN=File '.*keys.txt' not found;
source filekeys_badtest.inc;
#
# key id= 0
#
write_file $MYSQL_TMP_DIR/keys.txt;
1;11111111111111111111111111111111
0;00000000000000000000000000000000
2;22222222222222222222222222222222
EOF
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--error 2
install soname 'file_key_management';
source filekeys_badtest.inc;
let SEARCH_PATTERN=Invalid key id;
source filekeys_badtest.inc;
#
# id too big
#
remove_file $MYSQL_TMP_DIR/keys.txt;
write_file $MYSQL_TMP_DIR/keys.txt;
1;11111111111111111111111111111111
4294967299;00000000000000000000000000000000
2;22222222222222222222222222222222
EOF
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--error 2
install soname 'file_key_management';
source filekeys_badtest.inc;
let SEARCH_PATTERN=Invalid key id;
source filekeys_badtest.inc;
#
# wrong key length (not 16, 24, 23 bytes)
#
remove_file $MYSQL_TMP_DIR/keys.txt;
write_file $MYSQL_TMP_DIR/keys.txt;
1;11111111111111111111111111111111
3;00000000000000000000000000000000111122223333
2;22222222222222222222222222222222
EOF
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--error 2
install soname 'file_key_management';
source filekeys_badtest.inc;
let SEARCH_PATTERN=Invalid key;
source filekeys_badtest.inc;
#
# wrong key length (not an even number of digits)
#
remove_file $MYSQL_TMP_DIR/keys.txt;
write_file $MYSQL_TMP_DIR/keys.txt;
1;11111111111111111111111111111111
3;0000000000000000000000000000000
2;22222222222222222222222222222222
EOF
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--error 2
install soname 'file_key_management';
source filekeys_badtest.inc;
let SEARCH_PATTERN=Invalid key;
source filekeys_badtest.inc;
#
# no semicolon
#
remove_file $MYSQL_TMP_DIR/keys.txt;
write_file $MYSQL_TMP_DIR/keys.txt;
1;11111111111111111111111111111111
3:0000000000000000000000000000000
2;22222222222222222222222222222222
EOF
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--error 2
install soname 'file_key_management';
source filekeys_badtest.inc;
let SEARCH_PATTERN=Syntax error;
source filekeys_badtest.inc;
#
# another syntax error
#
remove_file $MYSQL_TMP_DIR/keys.txt;
write_file $MYSQL_TMP_DIR/keys.txt;
1;11111111111111111111111111111111
syntax error
2;22222222222222222222222222222222
EOF
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--error 2
install soname 'file_key_management';
source filekeys_badtest.inc;
let SEARCH_PATTERN=Syntax error;
source filekeys_badtest.inc;

2
mysql-test/suite/plugins/t/filekeys_unencfile.opt
View File

@@ -1,2 +0,0 @@
--loose-file-key-management-filekey=bad
--loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt

2
mysql-test/suite/plugins/t/filekeys_unencfile.test
View File

@@ -1,2 +0,0 @@
let SEARCH_PATTERN=Cannot decrypt .*keys.txt. Not encrypted;
source filekeys_badtest.inc;