From 8ea09a53c691e2f2980bb09612f45d2a5946340a Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 25 Oct 2023 00:29:31 +0000 Subject: 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. --- t/dir_idle.t | 1 - t/fake_inotify.t | 2 -- xt/check-run.t | 2 ++ 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/t/dir_idle.t b/t/dir_idle.t index 35c800f9..14aad7a1 100644 --- 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 56f64588..8221e092 100644 --- 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 6eefcb7d..cda839fe 100755 --- 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 -- cgit v1.2.3-24-ge0c7