xt/check-run: call DS->Reset after all tests

This ensures reused processes get a clean start and
avoids surprises as we develop more code around the
DS event loop.

diff --git a/t/dir_idle.t b/t/dir_idle.t
index 35c800f98b99aa83256db7ba410d5c22462f3e2f..14aad7a1654042f22304d972b3d93064819f4ac2 100644 (file)
--- a/t/dir_idle.t
+++ b/t/dir_idle.t
@@ -41,5 +41,4 @@ is(scalar(@x), 1, 'got an event') and
        ok($x[0]->[0]->IN_DELETE_SELF || $x[0]->[0]->IN_MOVE_SELF,
                'IN_DELETE_SELF set on move');
 
-PublicInbox::DS->Reset;
 done_testing;

diff --git a/t/fake_inotify.t b/t/fake_inotify.t
index 56f64588d71f634db99f4feef95c7dfe50f3f23e..8221e092a218c8c1e91e447faa06fd5d50296367 100644 (file)
--- a/t/fake_inotify.t
+++ b/t/fake_inotify.t
@@ -48,6 +48,4 @@ is_deeply([map{ $_->fullname }@events], ["$tmpdir/new/tst"], 'unlink detected')
        diag explain(\@events);
 ok($events[0]->IN_DELETE, 'IN_DELETE set on unlink');
 
-PublicInbox::DS->Reset;
-
 done_testing;

diff --git a/xt/check-run.t b/xt/check-run.t
index 6eefcb7d8f200f19d290db3895c92ca47491f560..cda839fe97a381f06a2f0864c894c1762f4d31dd 100755 (executable)
--- a/xt/check-run.t
+++ b/xt/check-run.t
@@ -14,6 +14,7 @@ use v5.12;
 use IO::Handle; # ->autoflush
 use PublicInbox::TestCommon;
 use PublicInbox::Spawn;
+use PublicInbox::DS; # already loaded by Spawn via ProcessIO
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
 use Errno qw(EINTR);
 use Fcntl qw(:seek);
@@ -187,6 +188,7 @@ my $start_worker = sub {
                        DIE "short read $r" if $r != UINT_SIZE;
                        my $t = unpack('I', $buf);
                        run_test($todo->[$t]);
+                       PublicInbox::DS->Reset;
                        $tb->reset;
                }
                kill 'USR1', $producer if !$eof; # sets $eof in $producer