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

Fix pt-table-checksum/privs.t so it doesn't break the sandbox.

Browse Source
This commit is contained in:
Daniel Nichter
2012-06-05 13:35:17 -07:00
parent 3160b70b00
commit 4fbecaa3d3
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/pt-table-checksum/privs.t
View File

@@ -29,12 +29,13 @@ require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts); my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master'); my $master_dbh = $sb->get_dbh_for('master');
my $slave_dbh = $sb->get_dbh_for('slave1'); my $slave1_dbh = $sb->get_dbh_for('slave1');
my $slave2_dbh = $sb->get_dbh_for('slave2');
if ( !$master_dbh ) { if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
elsif ( !$slave_dbh ) { elsif ( !$slave1_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave1'; plan skip_all => 'Cannot connect to sandbox slave1';
} }
elsif ( !@{$master_dbh->selectall_arrayref('show databases like "sakila"')} ) { elsif ( !@{$master_dbh->selectall_arrayref('show databases like "sakila"')} ) {
@@ -64,7 +65,7 @@ pt_table_checksum::main(@args,
qw(-t sakila.country --quiet --quiet)); qw(-t sakila.country --quiet --quiet));
diag(`/tmp/12345/use -u root < $trunk/t/lib/samples/ro-checksum-user.sql`); diag(`/tmp/12345/use -u root < $trunk/t/lib/samples/ro-checksum-user.sql`);
PerconaTest::wait_for_table($slave_dbh, "mysql.tables_priv", "user='ro_checksum_user'"); PerconaTest::wait_for_table($slave1_dbh, "mysql.tables_priv", "user='ro_checksum_user'");
$output = output( $output = output(
sub { $exit_status = pt_table_checksum::main(@args, sub { $exit_status = pt_table_checksum::main(@args,
@@ -90,6 +91,12 @@ like(
); );
diag(`/tmp/12345/use -u root -e "drop user 'ro_checksum_user'\@'%'"`); diag(`/tmp/12345/use -u root -e "drop user 'ro_checksum_user'\@'%'"`);
wait_until(
sub {
my $rows=$slave2_dbh->selectall_arrayref("SELECT user FROM mysql.user");
return !grep { ($_->[0] || '') ne 'ro_checksum_user' } @$rows;
}
);
# ############################################################################# # #############################################################################
# Done. # Done.