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

Unlink file only if it exists, to avoid test errors.

Browse Source
This commit is contained in:
Daniel Nichter
2012-08-22 13:57:39 -06:00
parent 250847455d
commit f2fd553bae
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
t/pt-query-digest/read_timeout.t
View File

@@ -21,8 +21,9 @@ use POSIX qw(mkfifo);
# #########################################################################
my $pid_file = '/tmp/mqd.pid';
my $fifo = '/tmp/mqd.fifo';
unlink $pid_file and diag("Unlinking existing $pid_file");
unlink $fifo and diag("Unlinking existing $fifo");
unlink $pid_file if $pid_file;
unlink $fifo if $fifo;
my ($start, $end, $waited, $timeout);
SKIP: {
@@ -40,7 +41,7 @@ SKIP: {
);
$end = time;
$waited = $end - $start;
if ( $timeout ) {
if ( $timeout && -f $pid_file ) {
# mqd ran longer than --read-timeout
chomp(my $pid = slurp_file($pid_file));
kill SIGTERM => $pid if $pid;
@@ -52,7 +53,7 @@ SKIP: {
);
}
unlink $pid_file;
unlink $pid_file if $pid_file;
mkfifo $fifo, 0700;
system("$trunk/t/pt-query-digest/samples/write-to-fifo.pl $fifo 4 &");
@@ -66,7 +67,7 @@ $timeout = wait_for(
);
$end = time;
$waited = $end - $start;
if ( $timeout ) {
if ( $timeout && $pid_file ) {
# mqd ran longer than --read-timeout
chomp(my $pid = slurp_file($pid_file));
kill SIGTERM => $pid if $pid;
@@ -77,8 +78,8 @@ ok(
sprintf("--read-timeout waited %.1f seconds reading a file", $waited)
);
unlink $pid_file;
unlink $fifo;
unlink $pid_file if $pid_file;
unlink $fifo if $fifo;
# #############################################################################
# Done.