percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-28 17:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix t/pt-slave-delay/auto_restart.t and use direct call, no backticks.

Browse Source
This commit is contained in:
Daniel Nichter
2012-10-25 15:36:24 -06:00
parent 467d0ca7b1
commit 5b4b3886b2
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
t/pt-slave-delay/auto_restart.t
View File

@@ -29,12 +29,8 @@ if ( !$dbh ) {
elsif ( !@{$dbh->selectcol_arrayref("SHOW DATABASES LIKE 'sakila'")} ) {
plan skip_all => 'sakila db not loaded';
}
else {
plan tests => 3;
}
my $cnf = '/tmp/12346/my.sandbox.cnf';
my $cmd = "$trunk/bin/pt-slave-delay -F $cnf";
my $output;
# #############################################################################
@@ -49,10 +45,13 @@ my $output;
my $pid = fork();
if ( $pid ) {
# parent
$output = `$cmd --interval 1 --run-time 4 2>&1`;
$output = output(
sub { pt_slave_delay::main('-F', $cnf, qw(--interval 1 --run-time 4)) },
stderr => 1,
);
like(
$output,
qr/Lost connection.+?Reconnected to slave.+Setting slave to run/ms,
qr/Lost connection.+?Setting slave to run/ms,
"Reconnect to slave"
);
}
@@ -70,14 +69,20 @@ else {
# Reap the child.
waitpid ($pid, 0);
$sb->wait_for_slaves;
# Do it all over again, but this time KILL instead of restart.
$pid = fork();
if ( $pid ) {
# parent. Note the --database mysql
$output = `$cmd --database mysql --interval 1 --run-time 4 2>&1`;
$output = output(
sub { pt_slave_delay::main('-F', $cnf, qw(--interval 1 --run-time 4),
qw(--database mysql)) },
stderr => 1,
);
like(
$output,
qr/Lost connection.+?Reconnected to slave.+Setting slave to run/ms,
qr/Lost connection.+?Setting slave to run/ms,
"Reconnect to slave when KILL'ed"
);
}
@@ -106,4 +111,5 @@ waitpid ($pid, 0);
# #############################################################################
$sb->wipe_clean($master_dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;
exit;