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,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE 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 8B06C1F69D for ; Wed, 13 Dec 2023 00:50:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1702428621; bh=5YIN6A7GZ95BaFCx2WptGxE1qKAwUWQAAIIjFbx/9Uo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=niYxZ5xLniol8M9fJSmEREezGhgU7WauVZ9FY1+kNTv4SrqwVk/dFQTDyzmXYfMxL vFBaCM1ZiR/468d7BC4Ie0zBRI8do7DltWaQrqlHBTEShTOE36UO632DVCh7fO4Mhz RiXZdoGPi2QrGGqD5+8Yh1c6OYzwruXwFZfe6orQ= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 10/14] test_common: extract oct_is from search.t Date: Wed, 13 Dec 2023 00:50:15 +0000 Message-ID: <20231213005019.26912-11-e@80x24.org> In-Reply-To: <20231213005019.26912-1-e@80x24.org> References: <20231213005019.26912-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: And use it in convert-compact.t This gives us nicer errors for debugging a problem I noticed on Alpine Linux (tested 3.19.0) --- lib/PublicInbox/TestCommon.pm | 8 +++++++- t/convert-compact.t | 18 +++++++++--------- t/search.t | 5 ----- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 9c413f43..22c50675 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -29,7 +29,7 @@ BEGIN { tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt test_httpd xbail require_cmd is_xdeeply tail_f ignore_inline_c_missing no_pollerfd no_coredump cfg_new - strace strace_inject lsof_pid); + strace strace_inject lsof_pid oct_is); require Test::More; my @methods = grep(!/\W/, @Test::More::EXPORT); eval(join('', map { "*$_=\\&Test::More::$_;" } @methods)); @@ -1033,6 +1033,12 @@ sub strace_inject (;$) { $cmd } +sub oct_is ($$$) { + my ($got, $exp, $msg) = @_; + @_ = (sprintf('0%03o', $got), sprintf('0%03o', $exp), $msg); + goto &is; # tail recursion to get lineno from callers on failure +} + package PublicInbox::TestCommon::InboxWakeup; use strict; sub on_inbox_unlock { ${$_[0]}->($_[1]) } diff --git a/t/convert-compact.t b/t/convert-compact.t index 1ac3517d..c7b7f77e 100644 --- a/t/convert-compact.t +++ b/t/convert-compact.t @@ -35,14 +35,14 @@ EOF $im->add($eml) or BAIL_OUT '->add'; }; umask(077) or BAIL_OUT "umask: $!"; -is(((stat("$ibx->{inboxdir}/public-inbox"))[2]) & 07777, 0755, +oct_is(((stat("$ibx->{inboxdir}/public-inbox"))[2]) & 07777, 0755, 'sharedRepository respected for v1'); -is(((stat("$ibx->{inboxdir}/public-inbox/msgmap.sqlite3"))[2]) & 07777, 0644, - 'sharedRepository respected for v1 msgmap'); +oct_is(((stat("$ibx->{inboxdir}/public-inbox/msgmap.sqlite3"))[2]) & 07777, + 0644, 'sharedRepository respected for v1 msgmap'); my @xdir = glob("$ibx->{inboxdir}/public-inbox/xap*/*"); foreach (@xdir) { my @st = stat($_); - is($st[2] & 07777, -f _ ? 0644 : 0755, + oct_is($st[2] & 07777, -f _ ? 0644 : 0755, 'sharedRepository respected on file after convert'); } @@ -55,7 +55,7 @@ ok(run_script($cmd, undef, $rdr), 'v1 compact works'); @xdir = glob("$ibx->{inboxdir}/public-inbox/xap*"); is(scalar(@xdir), 1, 'got one xapian directory after compact'); -is(((stat($xdir[0]))[2]) & 07777, 0755, +oct_is(((stat($xdir[0]))[2]) & 07777, 0755, 'sharedRepository respected on v1 compact'); my $hwm = do { @@ -73,7 +73,7 @@ ok(run_script($cmd, undef, $rdr), 'convert works'); @xdir = glob("$tmpdir/x/v2/xap*/*"); foreach (@xdir) { my @st = stat($_); - is($st[2] & 07777, -f _ ? 0644 : 0755, + oct_is($st[2] & 07777, -f _ ? 0644 : 0755, 'sharedRepository respected after convert'); } @@ -87,17 +87,17 @@ is($ibx->mm->num_highwater, $hwm, 'highwater mark unchanged in v2 inbox'); @xdir = glob("$tmpdir/x/v2/xap*/*"); foreach (@xdir) { my @st = stat($_); - is($st[2] & 07777, -f _ ? 0644 : 0755, + oct_is($st[2] & 07777, -f _ ? 0644 : 0755, 'sharedRepository respected after v2 compact'); } -is(((stat("$tmpdir/x/v2/msgmap.sqlite3"))[2]) & 07777, 0644, +oct_is(((stat("$tmpdir/x/v2/msgmap.sqlite3"))[2]) & 07777, 0644, 'sharedRepository respected for v2 msgmap'); @xdir = (glob("$tmpdir/x/v2/git/*.git/objects/*/*"), glob("$tmpdir/x/v2/git/*.git/objects/pack/*")); foreach (@xdir) { my @st = stat($_); - is($st[2] & 07777, -f _ ? 0444 : 0755, + oct_is($st[2] & 07777, -f _ ? 0444 : 0755, 'sharedRepository respected after v2 compact'); } my $msgs = $ibx->over->recent({limit => 1000}); diff --git a/t/search.t b/t/search.t index 282ae586..9fda6694 100644 --- a/t/search.t +++ b/t/search.t @@ -34,11 +34,6 @@ my $rw_commit = sub { $ibx->search->reopen; }; -sub oct_is ($$$) { - my ($got, $exp, $msg) = @_; - is(sprintf('0%03o', $got), sprintf('0%03o', $exp), $msg); -} - { # git repository perms use_ok 'PublicInbox::Umask';