Skip to content

Commit

Permalink
tests: print ${TEST} instead of tmpdir path in output
Browse files Browse the repository at this point in the history
The tmpdir will have been pruned, so printing the fill path is not
useful.  Also, it is a pain to read and makes for very long lines.

Just show when files are relative to the TestPAUSE tmpdir.
  • Loading branch information
rjbs committed May 11, 2024
1 parent 6e37f75 commit e5587d3
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions t/lib/PAUSE/TestPAUSE.pm
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,11 @@ sub file_updated_ok {

local $Test::Builder::Level = $Test::Builder::Level + 1;

my $tmpdir = $self->tmpdir . "";
my $prettyname = $filename =~ s/\Q$tmpdir/\${TEST}/r;

unless (-e $filename) {
return Test::More::fail("$desc$filename not updated");
return Test::More::fail("$desc$prettyname not updated");
}

my ($dev, $ino) = stat $filename;
Expand All @@ -397,12 +400,12 @@ sub file_updated_ok {

unless (defined $old) {
$self->_file_index->{$filename} = "$dev,$ino";
return Test::More::pass("$desc$filename updated (created)");
return Test::More::pass("$desc$prettyname updated (created)");
}

my $ok = Test::More::ok(
$old ne "$dev,$ino",
"$desc$filename updated",
"$desc$prettyname updated",
);

$self->_file_index->{$filename} = "$dev,$ino";
Expand All @@ -417,21 +420,24 @@ sub file_not_updated_ok {

my $old = $self->_file_index->{ $filename };

my $tmpdir = $self->tmpdir . "";
my $prettyname = $filename =~ s/\Q$tmpdir/\${TEST}/r;

unless (-e $filename) {
return Test::More::fail("$desc$filename deleted") if $old;
return Test::More::pass("$desc$filename not created (thus not updated)");
return Test::More::fail("$desc$prettyname deleted") if $old;
return Test::More::pass("$desc$prettyname not created (thus not updated)");
}

my ($dev, $ino) = stat $filename;

unless (defined $old) {
$self->_file_index->{$filename} = "$dev,$ino";
return Test::More::fail("$desc$filename updated (created)");
return Test::More::fail("$desc$prettyname updated (created)");
}

my $ok = Test::More::ok(
$old eq "$dev,$ino",
"$desc$filename not updated",
"$desc$prettyname not updated",
);

return $ok;
Expand Down

0 comments on commit e5587d3

Please sign in to comment.