From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 098031F55F for ; Thu, 14 Sep 2023 20:52:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1694724726; bh=IVCNgVfDK4kKh3OATMgjjF2gZv/sWE42nxUtgOOVHtk=; h=Date:From:To:Subject:References:In-Reply-To:From; b=QdHmexLawptjPi3t99jD0onPNQ6wAr3Ca91vj2zHvLwO/Hf8Xlv78wSHL+wjds5nF ZMhBu3ddP7hFg/oVAqXVXpjoT5DU2J8yD8ey9eMJzgCKfWHG4oqv0Llr7ovZ97xFMR +UwWx3i2Da9o3GO32nMYcWopOeEw9gPuyIzqfx+w= Date: Thu, 14 Sep 2023 20:52:05 +0000 From: Eric Wong To: meta@public-inbox.org Subject: [PATCHv2 2/1] test_common: eliminate call to non-existent cleanup_task Message-ID: <20230914205205.M910525@dcvr> References: <20230914125056.1898553-1-e@80x24.org> <20230914130226.M433545@dcvr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230914130226.M433545@dcvr> List-Id: cleanup_task is long gone since all that cleanup work got moved into DS itself. Adding a DS->Reset here breaks t/imapd.t (and possibly other tests), and is actually unlikely to avoid any cleanup segfaults on OpenBSD since those are only happening after `END {}' blocks are called. --- Original 2/1 patch broke t/imapd.t :x lib/PublicInbox/TestCommon.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index a8323e4d..4c819a4f 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -365,7 +365,8 @@ sub run_script ($;$$) { chdir $d or die "chdir $d: $!"; } _run_sub($sub, $key, \@argv); - eval { PublicInbox::Inbox::cleanup_task() }; + # n.b. all our uses of PublicInbox::DS should be fine + # with this and we can't Reset here. die "fchdir(restore): $!" if $cwdfh && !chdir($cwdfh); _undo_redirects($orig_io); select STDOUT;