Improve resource command and info file.

Fixes #256
Fixes #257

info files now contain the PID. yath resources will look for the newest
pfile and/or info_file and use the most recent.

Less noisy on failure to delete file.

Author: exodist

.gitignore

@@ -30,3 +30,4 @@ t/integration/test-broken-symlinks/broken-symlink.tx
 coverage.json
 lastlog.*
 *.test_info.json
+*.test_info.*.json

Changes

@@ -1,5 +1,7 @@
 {{$NEXT}}
 
+    - Further improve resource command and file
+
 1.000131  2022-09-06 15:53:55-07:00 America/Los_Angeles
 
     - Use relative file paths for job slot display

lib/App/Yath/Command/resources.pm

@@ -6,6 +6,7 @@ our $VERSION = '1.000132';
 
 use Term::Table();
 use File::Spec();
+use Time::HiRes qw/sleep/;
 
 use App::Yath::Util qw/find_pfile/;
 
@@ -29,26 +30,47 @@ A look at the state and resources used by a runner.
 
 sub pfile_params { (no_fatal => 1) }
 
+sub newest {
+    my ($a, $b) = @_;
+    return $a unless $b;
+    return $b unless $a;
+
+    my @as = stat($a);
+    my @bs = stat($b);
+    return $a if $as[9] > $bs[9];
+    return $b;
+}
+
 sub state {
     my $self = shift;
 
     return $self->{+STATE} if $self->{+STATE};
 
-    if (-e './.test_info.json') {
-        my $data = Test2::Harness::Util::File::JSON->new(name => './.test_info.json')->read;
-        return $self->{+STATE} = Test2::Harness::Runner::State->new(%$data);
+    my $info_file;
+    opendir(my $dh, "./") or die "Could not open current dir: $!";
+    for my $file (readdir($dh)) {
+        next unless $file =~ m{^\.test_info\.\S+\.json$};
+        $info_file = newest($info_file, "./$file");
     }
 
-    if (my $pfile = find_pfile($self->settings, no_fatal => 1)) {
-        my $data     = Test2::Harness::Util::File::JSON->new(name => $pfile)->read();
-        my $workdir  = $data->{dir};
-        my $settings = Test2::Harness::Util::File::JSON->new(name => "$workdir/settings.json")->read();
+    my $pfile = find_pfile($self->settings, no_fatal => 1);
 
-        return $self->{+STATE} = Test2::Harness::Runner::State->new(
-            job_count => $settings->{runner}->{job_count} // 1,
-            workdir   => $data->{dir},
-            settings  => $settings,
-        );
+    if (my $use = newest($info_file, $pfile)) {
+        if ($info_file) {
+            my $data = Test2::Harness::Util::File::JSON->new(name => $info_file)->read;
+            return $self->{+STATE} = Test2::Harness::Runner::State->new(%$data);
+        }
+
+        if (my $pfile = find_pfile($self->settings, no_fatal => 1)) {
+            my $data     = Test2::Harness::Util::File::JSON->new(name => $pfile)->read();
+            my $workdir  = $data->{dir};
+            my $settings = Test2::Harness::Util::File::JSON->new(name => "$workdir/settings.json")->read();
+
+            return $self->{+STATE} = Test2::Harness::Runner::State->new(
+                job_count => $settings->{runner}->{job_count} // 1,
+                workdir   => $data->{dir},
+            );
+        }
     }
 
     die "No persistent runner, and no running test found.\n";
@@ -58,16 +80,21 @@ sub run {
     my $self = shift;
 
     my $state = $self->state;
-    $state->poll;
-
-    print "\n==== Resource state ====\n";
-    for my $resource (@{$state->resources}) {
-        my @lines = $resource->status_lines;
-        next unless @lines;
-        print "\nResource: " . ref($resource) . "\n";
-        print join "\n" => @lines;
+
+    while (1) {
+        $state->poll;
+
+        print "\r\e[2J\r\e[1;1H";
+        print "\n==== Resource state ====\n";
+        for my $resource (@{$state->resources}) {
+            my @lines = $resource->status_lines;
+            next unless @lines;
+            print "\nResource: " . ref($resource) . "\n";
+            print join "\n" => @lines;
+        }
+        print "\n\n";
+        sleep 0.1;
     }
-    print "\n\n";
 
     return 0;
 }

lib/App/Yath/Command/run.pm

@@ -79,6 +79,10 @@ sub run {
     return $self->SUPER::run(@_);
 }
 
+sub write_test_info {
+    $ENV{TEST2_HARNESS_NO_WRITE_TEST_INFO} //= 1;
+}
+
 sub check_reload_state {
     my $self = shift;
 

lib/App/Yath/Command/start.pm

@@ -105,6 +105,8 @@ file over and over again.
 sub run {
     my $self = shift;
 
+    $ENV{TEST2_HARNESS_NO_WRITE_TEST_INFO} //= 1;
+
     my $settings = $self->settings;
     my $dir      = $settings->workspace->workdir;
 

lib/App/Yath/Command/test.pm

@@ -255,24 +255,36 @@ sub DESTROY {
     }
 }
 
+sub write_test_info {
+    my $self = shift;
+
+    return if $ENV{TEST2_HARNESS_NO_WRITE_TEST_INFO};
+
+    my $info_file = "./.test_info.$$.json";
+
+    my $workdir = $self->workdir;
+    Test2::Harness::Util::File::JSON->new(name => $info_file)->write({
+        workdir   => $self->workdir,
+        job_count => $self->job_count,
+    });
+
+    push @{$self->{+CLEANUP_SUBS}} => sub {
+        return unless -e $info_file;
+        return unless Test2::Harness::Util::File::JSON->new(name => $info_file)->read->{workdir} eq $workdir;
+        unlink($info_file) or die "Could not unlink info file: $!";
+    };
+
+    $ENV{TEST2_HARNESS_NO_WRITE_TEST_INFO} = 1;
+}
+
 sub start {
     my $self = shift;
 
     $self->ipc->start();
     $self->parse_args;
     $self->write_settings_to($self->workdir, 'settings.json');
 
-    unless ($ENV{TEST2_HARNESS_NO_WRITE_TEST_INFO}) {
-        Test2::Harness::Util::File::JSON->new(name => './.test_info.json')->write({
-            workdir   => $self->workdir,
-            job_count => $self->job_count,
-        });
-
-        push @{$self->{+CLEANUP_SUBS}} => sub { unlink('./.test_info.json') or warn "Could not unlink: $!" };
-
-        $ENV{TEST2_HARNESS_NO_WRITE_TEST_INFO} = 1;
-    }
-
+    $self->write_test_info();
     my $pop = $self->populate_queue();
     $self->terminate_queue();