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

Add hires timestamp to PTDEVDEBUG. Debug daemonize.pl. Make wait_until() defaults shorter.

Browse Source
This commit is contained in:
Daniel Nichter
2012-02-14 09:31:47 -07:00
parent c943f7a0da
commit e9f6325592
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
t/lib/Daemon.t
View File

@@ -54,17 +54,19 @@ ok(! -f $pid_file, 'Removes PID file upon exit');
# ############################################################################
rm_tmp_files();
system("$cmd 2 --daemonize --log $log_file");
system("$cmd 0 --daemonize --log $log_file");
PerconaTest::wait_for_files($log_file);
ok(-f $log_file, 'Log file exists');
sleep 2;
$output = `cat $log_file`;
like($output, qr/STDOUT\nSTDERR\n/, 'STDOUT and STDERR went to log file');
my $log_size = -s $log_file;
PTDEVDEBUG && PerconaTest::_d('log size', $log_size);
# Check that the log file is appended to.
system("$cmd 0 --daemonize --log $log_file");
PerconaTest::wait_for_files($log_file);
PerconaTest::wait_until(sub { -s $log_file > $log_size });
$output = `cat $log_file`;
like(
$output,
@@ -82,7 +84,7 @@ ok(
'PID file already exists'
);
$output = `PTDEBUG=1 $cmd 0 --daemonize --pid $pid_file 2>&1`;
$output = `$cmd 2 --daemonize --pid $pid_file 2>&1`;
like(
$output,
qr{The PID file $pid_file already exists},
@@ -126,6 +128,8 @@ SKIP: {
$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";
PTDEVDEBUG && PerconaTest::_d('pid_file', $pid_file,
'pid', $pid, 'proc_fd_0', $proc_fd_0, `ls -l $proc_fd_0`);
$stdin = readlink $proc_fd_0;
like(
$stdin,