From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id AACF51F4BD for ; Thu, 3 Oct 2019 07:38:17 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] t/search: show file modes as octal on failures Date: Thu, 3 Oct 2019 07:38:17 +0000 Message-Id: <20191003073817.13259-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This ought to make permissions errors on odd systems easier to diagnose in the future. --- t/search.t | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/t/search.t b/t/search.t index b1dbb301..830c668e 100644 --- a/t/search.t +++ b/t/search.t @@ -35,28 +35,30 @@ my $rw_commit = sub { $rw->begin_txn_lazy; }; +sub oct_is ($$$) { + my ($got, $exp, $msg) = @_; + is(sprintf('0%03o', $got), sprintf('0%03o', $exp), $msg); +} + { # git repository perms - is($ibx->_git_config_perm(), &PublicInbox::InboxWritable::PERM_GROUP, - "undefined permission is group"); - is(PublicInbox::InboxWritable::_umask_for( - PublicInbox::InboxWritable->_git_config_perm('0644')), - 0022, "644 => umask(0022)"); - is(PublicInbox::InboxWritable::_umask_for( - PublicInbox::InboxWritable->_git_config_perm('0600')), - 0077, "600 => umask(0077)"); - is(PublicInbox::InboxWritable::_umask_for( - PublicInbox::InboxWritable->_git_config_perm('0640')), - 0027, "640 => umask(0027)"); - is(PublicInbox::InboxWritable::_umask_for( - PublicInbox::InboxWritable->_git_config_perm('group')), - 0007, 'group => umask(0007)'); - is(PublicInbox::InboxWritable::_umask_for( - PublicInbox::InboxWritable->_git_config_perm('everybody')), - 0002, 'everybody => umask(0002)'); - is(PublicInbox::InboxWritable::_umask_for( - PublicInbox::InboxWritable->_git_config_perm('umask')), - umask, 'umask => existing umask'); + oct_is($ibx->_git_config_perm(), + &PublicInbox::InboxWritable::PERM_GROUP, + 'undefined permission is group'); + my @t = ( + [ '0644', 0022, '644 => umask(0022)' ], + [ '0600', 0077, '600 => umask(0077)' ], + [ '0640', 0027, '640 => umask(0027)' ], + [ 'group', 0007, 'group => umask(0007)' ], + [ 'everybody', 0002, 'everybody => umask(0002)' ], + [ 'umask', umask, 'umask => existing umask' ], + ); + for (@t) { + my ($perm, $exp, $msg) = @$_; + my $got = PublicInbox::InboxWritable::_umask_for( + PublicInbox::InboxWritable->_git_config_perm($perm)); + oct_is($got, $exp, $msg); + } } $ibx->with_umask(sub { @@ -452,7 +454,7 @@ foreach my $f ("$git_dir/public-inbox/msgmap.sqlite3", glob("$git_dir/public-inbox/xapian*/*")) { my @st = stat($f); my ($bn) = (split(m!/!, $f))[-1]; - is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask, + oct_is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask, "sharedRepository respected for $bn"); } -- EW