percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-27 16:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

t/lib/Daemon.t: Tweak the tests to hopefully avoid white smoke

Browse Source
This commit is contained in:
Brian Fraser
2012-07-23 12:28:55 -03:00
parent a1f1168ab4
commit a948014991
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
t/lib/Daemon.t
View File

@@ -168,8 +168,8 @@ ok(
my (undef, $tempfile) = tempfile(); my (undef, $tempfile) = tempfile();
system("$cmd 5 --daemonize --log $log_file --pid $pid_file 2>$tempfile"); system("$cmd 5 --daemonize --log $log_file --pid $pid_file > $tempfile 2>&1");
PerconaTest::wait_for_files($log_file, $pid_file); PerconaTest::wait_for_files($log_file, $pid_file, $tempfile);
$output = `ps wx | grep '$cmd 5' | grep -v grep`; $output = `ps wx | grep '$cmd 5' | grep -v grep`;
chomp(my $new_pid = slurp_file($pid_file)); chomp(my $new_pid = slurp_file($pid_file));
@@ -203,7 +203,7 @@ diag(`rm $tempfile >/dev/null`);
# Check that it actually checks the running process. # Check that it actually checks the running process.
# ############################################################################ # ############################################################################
rm_tmp_files(); rm_tmp_files();
system("$cmd 10 --daemonize --log $log_file --pid $pid_file"); system("$cmd 20 --daemonize --log $log_file --pid $pid_file");
PerconaTest::wait_for_files($pid_file, $log_file); PerconaTest::wait_for_files($pid_file, $log_file);
chomp($pid = slurp_file($pid_file)); chomp($pid = slurp_file($pid_file));
$output = `$cmd 0 --daemonize --pid $pid_file 2>&1`; $output = `$cmd 0 --daemonize --pid $pid_file 2>&1`;
@@ -213,6 +213,9 @@ like(
'Says that PID is running (issue 419)' 'Says that PID is running (issue 419)'
); );
kill SIGKILL => $pid
if $pid;
sleep 1; sleep 1;
rm_tmp_files(); rm_tmp_files();