Skip to content

Commit

Permalink
Merge branch 'quiet-test-noise'
Browse files Browse the repository at this point in the history
  • Loading branch information
rjbs committed May 11, 2024
2 parents 8a28520 + e5587d3 commit caafc03
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions t/lib/PAUSE/TestPAUSE.pm
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ sub _build_pause_config_overrides {

{
my $chdir_guard = pushd($git_dir);
system(qw(git init --initial-branch master)) and die "error running git init";
system(qw(git init --quiet --initial-branch master)) and die "error running git init";

my $git_config = File::Spec->catdir($git_dir, '.git/config');
open my $config_fh, '>', $git_config
Expand Down 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 caafc03

Please sign in to comment.