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

Stabilize some pt-kill tests.

Browse Source
This commit is contained in:
Daniel Nichter
2012-07-12 17:26:54 -06:00
parent 4430cfabb5
commit 554bd01f41
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/pt-kill/execute_command.t
View File

@@ -47,6 +47,7 @@ diag(`rm $out`);
SKIP: { SKIP: {
skip 'Cannot connect to sandbox master', 2 unless $master_dbh; skip 'Cannot connect to sandbox master', 2 unless $master_dbh;
$master_dbh->do("CREATE DATABASE IF NOT EXISTS pt_kill_zombie_test");
system "/tmp/12345/use -e 'select sleep(2)' >/dev/null 2>&1 &"; system "/tmp/12345/use -e 'select sleep(2)' >/dev/null 2>&1 &";
@@ -70,7 +71,7 @@ SKIP: {
diag(`rm $out`); diag(`rm $out`);
# Don't make zombies (https://bugs.launchpad.net/percona-toolkit/+bug/919819) # Don't make zombies (https://bugs.launchpad.net/percona-toolkit/+bug/919819)
system "/tmp/12345/use -e 'select sleep(2)' >/dev/null 2>&1 &"; $master_dbh->do("USE pt_kill_zombie_test");
my $sentinel = "/tmp/pt-kill-test.$PID.stop"; my $sentinel = "/tmp/pt-kill-test.$PID.stop";
my $pid_file = "/tmp/pt-kill-test.$PID.pid"; my $pid_file = "/tmp/pt-kill-test.$PID.pid";
@@ -79,8 +80,8 @@ SKIP: {
diag(`rm $pid_file 2>/dev/null`); diag(`rm $pid_file 2>/dev/null`);
diag(`rm $log_file 2>/dev/null`); diag(`rm $log_file 2>/dev/null`);
`$cmd --daemonize --match-info 'select sleep' --interval 1 --print --execute-command 'echo zombie > $out' --verbose --pid $pid_file --log $log_file --sentinel $sentinel`; `$cmd --daemonize --match-db pt_kill_zombie_test --interval 1 --print --execute-command 'echo zombie > $out' --verbose --pid $pid_file --log $log_file --sentinel $sentinel`;
sleep 1; PerconaTest::wait_for_files($pid_file, $log_file, $out);
$output = `grep Executed $log_file`; $output = `grep Executed $log_file`;
like( like(
$output, $output,

2
t/pt-kill/standard_options.t
View File

@@ -48,7 +48,7 @@ SKIP: {
'Log file created' 'Log file created'
); );
sleep 3; # --run-time=2; if we sleep 2 we'll get intermittent failures. wait_until(sub { return !-f '/tmp/pt-kill.pid' });
ok( ok(
!-f '/tmp/pt-kill.pid', !-f '/tmp/pt-kill.pid',
'PID file removed' 'PID file removed'