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

Create log file too to help avoid race conditions because it's created only by the child.

Browse Source
This commit is contained in:
Daniel Nichter
2013-08-10 19:26:19 -07:00
parent 2b747d7ee3
commit 368dde58f1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
t/lib/Daemon.t
View File

@@ -31,12 +31,12 @@ sub rm_tmp_files() {
# Test that it daemonizes, creates a PID file, and removes that PID file.
# ############################################################################
my $ret_val = system("$cmd 3 --daemonize --pid $pid_file >/dev/null 2>&1");
my $ret_val = system("$cmd 3 --daemonize --pid $pid_file --log $log_file");
die 'Cannot test Daemon.pm because t/daemonizes.pl is not working'
unless $ret_val == 0;
PerconaTest::wait_for_files($pid_file)
or die "$cmd did not create $pid_file";
PerconaTest::wait_for_files($pid_file, $log_file)
or die "$cmd did not create $pid_file and $log_file";
my ($pid, $output) = PerconaTest::get_cmd_pid("$cmd 3");
@@ -140,10 +140,10 @@ SKIP: {
skip 'No fd in /proc', 1 unless -l "/proc/$PID/0" || -l "/proc/$PID/fd/0";
system("$cmd 15 --daemonize --pid $pid_file --log $log_file");
PerconaTest::wait_for_files($pid_file)
or die "$cmd did not create $pid_file";
PerconaTest::wait_for_files($pid_file, $log_file)
or die "$cmd did not create $pid_file and $log_file";
my $pid = PerconaTest::get_cmd_pid("$cmd 15")
or die "Cannot get PID of $cmd 5";
or die "Cannot get PID of $cmd 15";
my $proc_fd_0 = -l "/proc/$pid/0" ? "/proc/$pid/0"
: -l "/proc/$pid/fd/0" ? "/proc/$pid/fd/0"
: die "Cannot find fd 0 symlink in /proc/$pid";