From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/3] t/cindex: use autodie
Date: Tue, 24 Oct 2023 11:44:28 +0000 [thread overview]
Message-ID: <20231024114429.2998844-3-e@80x24.org> (raw)
In-Reply-To: <20231024114429.2998844-1-e@80x24.org>
More tests to come, so cut down on the noise in the test code.
---
t/cindex.t | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/t/cindex.t b/t/cindex.t
index dbbccbb0..51317329 100644
--- a/t/cindex.t
+++ b/t/cindex.t
@@ -5,6 +5,7 @@ use v5.12;
use PublicInbox::TestCommon;
use Cwd qw(getcwd abs_path);
use List::Util qw(sum);
+use autodie qw(close open rename);
require_mods(qw(json Xapian));
use_ok 'PublicInbox::CodeSearchIdx';
require PublicInbox::Import;
@@ -51,17 +52,17 @@ my $zp = create_coderepo 'NUL in patch', sub {
$src =~ s/\b(Limitation of Liability\.)\n\n/$1\n\0\n/s or
xbail "BUG: no `\\n\\n' in $pwd/COPYING";
- open my $fh, '>', 'f' or xbail "open: $!";
+ open my $fh, '>', 'f';
print $fh $src or xbail "print: $!";
- close $fh or xbail "close: $!";
+ close $fh;
xsys_e([qw(/bin/sh -c), <<'EOM']);
git add f &&
git commit -q -m 'initial with NUL character'
EOM
$src =~ s/\n\0\n/\n\n/ or xbail "BUG: no `\\n\\0\\n'";
- open $fh, '>', 'f' or xbail "open: $!";
+ open $fh, '>', 'f';
print $fh $src or xbail "print: $!";
- close $fh or xbail "close: $!";
+ close $fh;
xsys_e([qw(/bin/sh -c), <<'EOM']);
git add f &&
git commit -q -m 'remove NUL character' &&
@@ -164,12 +165,12 @@ SKIP: { # --prune
my $csrch = PublicInbox::CodeSearch->new("$tmp/ext");
is(scalar($csrch->mset('s:hi')->items), 1, 'got hit');
- rename("$tmp/wt0/.git", "$tmp/wt0/.giit") or xbail "rename $!";
+ rename("$tmp/wt0/.git", "$tmp/wt0/.giit");
ok(run_script([qw(-cindex -q --prune -d), "$tmp/ext"]), 'prune');
$csrch->reopen;
is(scalar($csrch->mset('s:hi')->items), 0, 'hit pruned');
- rename("$tmp/wt0/.giit", "$tmp/wt0/.git") or xbail "rename $!";
+ rename("$tmp/wt0/.giit", "$tmp/wt0/.git");
ok(run_script([qw(-cindex -qu -d), "$tmp/ext"]), 'update');
$csrch->reopen;
is(scalar($csrch->mset('s:hi')->items), 0,
next prev parent reply other threads:[~2023-10-24 11:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 11:44 [PATCH 0/3] cindex: handle usage errors gracefully Eric Wong
2023-10-24 11:44 ` [PATCH 1/3] cindex: --associate fails when no inboxes are given Eric Wong
2023-10-24 11:44 ` Eric Wong [this message]
2023-10-24 11:44 ` [PATCH 3/3] cindex: basic inboxes are non-fatal for --associate Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231024114429.2998844-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).