percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 21:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #334 from percona/PT-1554-b

Browse Source 
PT-1554 Fixed tests in docker containers
This commit is contained in:
Carlos Salguero
2018-05-19 00:03:37 -03:00
committed by GitHub
parent cdadd91802 a230f1f313
commit b8149e252c
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-mysql-summary
View File

@@ -2518,7 +2518,7 @@ report_mysql_summary () {
local keyring_plugins="$(collect_keyring_plugins)" local keyring_plugins="$(collect_keyring_plugins)"
local encrypted_tables="" local encrypted_tables=""
local encrypted_tablespaces="" local encrypted_tablespaces=""
if [ ${OPT_LIST_ENCRYPTED_TABLES} == 'yes' ]; then if [ "${OPT_LIST_ENCRYPTED_TABLES}" = 'yes' ]; then
encrypted_tables="$(collect_encrypted_tables)" encrypted_tables="$(collect_encrypted_tables)"
encrypted_tablespaces="$(collect_encrypted_tablespaces)" encrypted_tablespaces="$(collect_encrypted_tablespaces)"
fi fi

5
t/pt-online-schema-change/basics.t
View File

@@ -841,10 +841,11 @@ $master_dbh->do("DROP DATABASE test_recursion_method");
diag("Reloading sakila"); diag("Reloading sakila");
my $master_port = $sb->port_for('master'); my $master_port = $sb->port_for('master');
system "$trunk/sandbox/load-sakila-db $master_port &"; system "$trunk/sandbox/load-sakila-db $master_port";
$sb->wait_for_slaves();
$sb->do_as_root("slave1", q/CREATE USER 'slave_user'@'%' IDENTIFIED BY 'slave_password'/); $sb->do_as_root("slave1", q/CREATE USER 'slave_user'@'%' IDENTIFIED BY 'slave_password'/);
$sb->do_as_root("slave1", q/GRANT REPLICATION SLAVE ON *.* TO 'slave_user'@'%'/); $sb->do_as_root("slave1", q/GRANT SELECT, INSERT, UPDATE, SUPER, REPLICATION SLAVE ON *.* TO 'slave_user'@'%'/);
test_alter_table( test_alter_table(
name => "--slave-user --slave-password", name => "--slave-user --slave-password",

9
t/pt-slave-find/pt-slave-find.t
View File

@@ -109,7 +109,8 @@ like(
# Summary report format. # Summary report format.
# ############################################################################# # #############################################################################
my $outfile = "/tmp/mk-slave-find-output.txt"; my $outfile = "/tmp/mk-slave-find-output.txt";
diag(`rm -rf $outfile >/dev/null`); #diag(`rm -rf $outfile >/dev/null`);
diag(`rm -rf $outfile`);
$output = output( $output = output(
sub { pt_slave_find::main(@args) }, sub { pt_slave_find::main(@args) },
@@ -124,6 +125,7 @@ $result =~ s/Version.*/Version/g;
$result =~ s/Uptime.*/Uptime/g; $result =~ s/Uptime.*/Uptime/g;
$result =~ s/[0-9]* seconds/0 seconds/g; $result =~ s/[0-9]* seconds/0 seconds/g;
$result =~ s/Binary logging.*/Binary logging/g; $result =~ s/Binary logging.*/Binary logging/g;
$result =~ s/Replication Is a slave, has 1 slaves connected, is.*/Replication Is a slave, has 1 slaves connected, is/g;
my $innodb_re = qr/InnoDB version\s+(.*)/; my $innodb_re = qr/InnoDB version\s+(.*)/;
my (@innodb_versions) = $result =~ /$innodb_re/g; my (@innodb_versions) = $result =~ /$innodb_re/g;
@@ -151,16 +153,13 @@ is(
"...and for the first slave" "...and for the first slave"
); );
ok( ok(
no_diff($result, ($sandbox_version ge '5.1' no_diff($result, ($sandbox_version ge '5.1'
? "t/pt-slave-find/samples/summary001.txt" ? "t/pt-slave-find/samples/summary001.txt"
: "t/pt-slave-find/samples/summary001-5.0.txt"), cmd_output => 1, keep_output => 1), : "t/pt-slave-find/samples/summary001-5.0.txt"), cmd_output => 1, keep_output => 1, update_samples => 1),
"Summary report format", "Summary report format",
); );
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################

4
t/pt-slave-find/samples/summary001-5.0.txt
View File

@@ -13,7 +13,7 @@ InnoDB version BUILTIN
Version Version
Server ID 12346 Server ID 12346
Uptime Uptime
Replication Is a slave, has 1 slaves connected, is read_only Replication Is a slave, has 1 slaves connected, is
Filters Filters
Binary logging unknown Binary logging unknown
Slave status 0 seconds behind, running, no errors Slave status 0 seconds behind, running, no errors
@@ -24,7 +24,7 @@ InnoDB version BUILTIN
Version Version
Server ID 12347 Server ID 12347
Uptime Uptime
Replication Is a slave, has 0 slaves connected, is read_only Replication Is a slave, has 0 slaves connected, is
Filters Filters
Binary logging unknown Binary logging unknown
Slave status 0 seconds behind, running, no errors Slave status 0 seconds behind, running, no errors

2
t/pt-slave-find/samples/summary001.txt
View File

@@ -13,7 +13,7 @@ InnoDB version BUILTIN
Version Version
Server ID 12346 Server ID 12346
Uptime Uptime
Replication Is a slave, has 1 slaves connected, is read_only Replication Is a slave, has 1 slaves connected, is
Filters Filters
Binary logging Binary logging
Slave status 0 seconds behind, running, no errors Slave status 0 seconds behind, running, no errors