From 2c7257caffe3d1196939fb6c6f49c3a0be7cda17 Mon Sep 17 00:00:00 2001
From: Daniel Nichter <daniel@percona.com>
Date: Wed, 24 Aug 2011 11:20:27 -0600
Subject: [PATCH] More stabilizing Daemon.t.

---
 lib/PerconaTest.pm | 14 ++++++++++++++
 t/lib/Daemon.t     |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/PerconaTest.pm b/lib/PerconaTest.pm
index 77da6fe6..2f48cc2e 100644
--- a/lib/PerconaTest.pm
+++ b/lib/PerconaTest.pm
@@ -272,6 +272,20 @@ sub wait_for_table {
    );
 }
 
+sub wait_for_files {
+   my (@files) = @_;
+   return wait_until(
+      sub {
+         foreach my $file (@files) {
+            return 0 if ! -f $file;
+         }
+         return 1;
+      },
+      0.25,
+      15,
+   );
+}
+
 sub _read {
    my ( $fh ) = @_;
    return <$fh>;
diff --git a/t/lib/Daemon.t b/t/lib/Daemon.t
index 0ef07fcd..eca86080 100644
--- a/t/lib/Daemon.t
+++ b/t/lib/Daemon.t
@@ -10,7 +10,7 @@ use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More tests => 22;
-
+use Time::HiRes qw(sleep);
 use Daemon;
 use OptionParser;
 use PerconaTest;
@@ -51,6 +51,7 @@ ok(! -f $pid_file, 'Removes PID file upon exit');
 rm_tmp_files();
 
 system("$cmd 2 --daemonize --log $log_file");
+PerconaTest::wait_for_files($log_file);
 ok(-f $log_file, 'Log file exists');
 
 sleep 2;
@@ -59,6 +60,7 @@ like($output, qr/STDOUT\nSTDERR\n/, 'STDOUT and STDERR went to log file');
 
 # Check that the log file is appended to.
 system("$cmd 0 --daemonize --log $log_file");
+PerconaTest::wait_for_files($log_file);
 $output = `cat $log_file`;
 like(
    $output,
@@ -99,6 +101,7 @@ SKIP: {
    skip 'No fd in /proc', 2 unless -l "/proc/$PID/0" || -l "/proc/$PID/fd/0";
 
    system("$cmd 1 --daemonize --pid $pid_file --log $log_file");
+   PerconaTest::wait_for_files($pid_file);
    chomp($pid = `cat $pid_file`);
    my $proc_fd_0 = -l "/proc/$pid/0"    ? "/proc/$pid/0"
                  : -l "/proc/$pid/fd/0" ? "/proc/$pid/fd/0"
@@ -112,6 +115,7 @@ SKIP: {
 
    sleep 1;
    system("echo foo | $cmd 1 --daemonize --pid $pid_file --log $log_file");
+   PerconaTest::wait_for_files($pid_file, $log_file);
    chomp($pid = `cat $pid_file`);
    $proc_fd_0 = -l "/proc/$pid/0"    ? "/proc/$pid/0"
               : -l "/proc/$pid/fd/0" ? "/proc/$pid/fd/0"
@@ -131,6 +135,7 @@ SKIP: {
 # ##########################################################################
 rm_tmp_files();
 system("$cmd 5 --daemonize --pid $pid_file 2>&1");
+PerconaTest::wait_for_files($pid_file);
 chomp($pid = `cat $pid_file`);
 kill 9, $pid;
 $output = `ps wx | grep '^[ ]*$pid' | grep -v grep`;
@@ -145,6 +150,7 @@ ok(
 );
 
 system("$cmd 1 --daemonize --log $log_file --pid $pid_file 2>/tmp/pre-daemonizes");
+PerconaTest::wait_for_files($log_file);
 $output = `ps wx | grep '$cmd 1' | grep -v grep`;
 chomp(my $new_pid = `cat $pid_file`);
 sleep 1;
@@ -173,6 +179,7 @@ diag(`rm -rf /tmp/pre-daemonizes`);
 # ############################################################################
 rm_tmp_files();
 system("$cmd 1 --daemonize --log $log_file --pid $pid_file");
+PerconaTest::wait_for_files($pid_file, $log_file);
 chomp($pid = `cat $pid_file`);
 $output = `$cmd 0 --daemonize --pid $pid_file 2>&1`;
 like(