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

Really wait for expected data in files.

Browse Source
This commit is contained in:
Daniel Nichter
2012-10-23 17:20:05 -06:00
parent 36ca6bbc23
commit 78e1f95257
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
t/pt-stalk/pt-stalk.t
View File

@@ -86,20 +86,21 @@ ok(
"Creates --dest (collect) dir" "Creates --dest (collect) dir"
); );
chomp($pid = `cat $pid_file`); chomp($pid = `cat $pid_file 2>/dev/null`);
$retval = system("kill -0 $pid"); $retval = system("kill -0 $pid");
is( is(
$retval >> 0, $retval >> 0,
0, 0,
"pt-stalk is running ($pid)" "pt-stalk is running"
); );
$output = `cat $log_file`; PerconaTest::wait_for_sh("grep -q 'Check results' $log_file >/dev/null");
$output = `cat $log_file 2>/dev/null`;
like( like(
$output, $output,
qr/Check results: Threads_running=\d+, matched=no, cycles_true=0/, qr/Check results: Threads_running=\d+, matched=no, cycles_true=0/,
"Check results logged" "Check results logged"
); ) or diag(`cat $log_file 2>/dev/null`);
$retval = system("kill $pid 2>/dev/null"); $retval = system("kill $pid 2>/dev/null");
is( is(
@@ -108,19 +109,19 @@ is(
"Killed pt-stalk" "Killed pt-stalk"
); );
sleep 1; PerconaTest::wait_until(sub { !-f $pid_file });
ok( ok(
! -f $pid_file, ! -f $pid_file,
"Removes PID file" "Removes PID file"
); );
$output = `cat $log_file`; $output = `cat $log_file 2>/dev/null`;
like( like(
$output, $output,
qr/Caught signal, exiting/, qr/Caught signal, exiting/,
"Caught signal logged" "Caught signal logged"
); ) or diag(`cat $log_file 2>/dev/null`);
# ########################################################################### # ###########################################################################
# Test collect. # Test collect.