percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-25 21:54:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fix-995896-cat-in-daemon

Browse Source
This commit is contained in:
Daniel Nichter
2012-10-30 17:04:22 -06:00
parent 7f353a8471 4ceecaf929
commit 376572e637
26 changed files with 355 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/lib/Daemon.t
View File

@@ -106,8 +106,8 @@ unlike(
# ##########################################################################
rm_tmp_files();
SKIP: {
skip 'No /proc', 1 unless -d '/proc';
skip 'No fd in /proc', 1 unless -l "/proc/$PID/0" || -l "/proc/$PID/fd/0";
skip 'No /proc', 2 unless -d '/proc';
skip 'No fd in /proc', 2 unless -l "/proc/$PID/0" || -l "/proc/$PID/fd/0";
system("$cmd 5 --daemonize --pid $pid_file --log $log_file");
PerconaTest::wait_for_files($pid_file);
@@ -256,7 +256,7 @@ ok(
'Dies if PID file already exists for non-daemon'
);
`rm -rf /tmp/d2.pid`;
diag(`rm -rf /tmp/d2.pid >/dev/null`);
}
# #############################################################################
@@ -264,4 +264,3 @@ ok(
# #############################################################################
rm_tmp_files();
done_testing;
exit;