From 59bb5f9287d5cd8009d8aae2d07fbf47d1b6bd91 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 24 Mar 2021 14:23:33 +0500 Subject: [PATCH] v2writable: cleanup SQLite handles on --xapian-only 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") --- lib/PublicInbox/V2Writable.pm | 1 + t/v2reindex.t | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) 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(); -- 2.44.0