diff options
author | Eric Wong <e@80x24.org> | 2021-03-24 14:23:33 +0500 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-03-24 23:01:20 +0000 |
commit | 59bb5f9287d5cd8009d8aae2d07fbf47d1b6bd91 (patch) | |
tree | 0d8ee49564aca917fa08d4f47054f91ead09f3b7 | |
parent | 55dabf7d68b57aa27d862c1036f0c2ade4edb1bc (diff) | |
download | public-inbox-59bb5f9287d5cd8009d8aae2d07fbf47d1b6bd91.tar.gz |
I'm not sure exactly why this is needed with run_script localizing %SIG and everything else, but explictly cleaning up seems to fix the occasional test failures I see. Followup-to: 4c6c853494b49368 ("tests: show lsof output on deleted-file-check failures")
-rw-r--r-- | lib/PublicInbox/V2Writable.pm | 1 | ||||
-rw-r--r-- | t/v2reindex.t | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 03590850..4130a472 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -1323,6 +1323,7 @@ sub xapian_only { } } $self->git->cat_async_wait; + $self->{ibx}->cleanup; $self->done; } diff --git a/t/v2reindex.t b/t/v2reindex.t index 1145e31b..e9f2b73b 100644 --- a/t/v2reindex.t +++ b/t/v2reindex.t @@ -549,5 +549,13 @@ my $env = { PI_CONFIG => '/dev/null' }; ok(run_script([qw(-index --reindex --xapian-only), $inboxdir], $env, $rdr), '--xapian-only works'); is($err, '', 'no errors from --xapian-only'); - +undef $for_destroy; +SKIP: { + use PublicInbox::Spawn qw(which); + skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux'; + my $lsof = which('lsof') or skip 'no lsof in PATH', 1; + my $rdr = { 2 => \(my $null_err) }; + my @d = grep(m!/xap[0-9]+/!, xqx([$lsof, '-p', $$], undef, $rdr)); + is_deeply(\@d, [], 'no deleted index files') or diag explain(\@d); +} done_testing(); |