From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/5] t/hl_mod.t: remove IPC::Run (and File::Temp) dependency
Date: Mon, 4 Nov 2019 03:01:36 +0000 [thread overview]
Message-ID: <20191104030137.4301-5-e@80x24.org> (raw)
In-Reply-To: <20191104030137.4301-1-e@80x24.org>
We already load PublicInbox::Spawn for which(), so using spawn()
isn't unreasonable. And rely on "skip" to log the omitted test
if w3m is missing, which means we need to update the "&&"
escaping test to be self-referential on the same line.
File::Temp was totally unused, there; and we can use "open ...,undef"
in Perl to easily create anonymous temporary files for use with
spawn().
---
t/hl_mod.t | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/t/hl_mod.t b/t/hl_mod.t
index 52ef39dc..4942404c 100644
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -4,8 +4,10 @@
use strict;
use warnings;
use Test::More;
+use PublicInbox::Spawn qw(which spawn);
+use Fcntl qw(:seek);
eval { require highlight } or
- plan skip_all => 'failed to load highlight.pm';
+ plan skip_all => "failed to load highlight.pm for $0";
use_ok 'PublicInbox::HlMod';
my $hls = PublicInbox::HlMod->new;
ok($hls, 'initialized OK');
@@ -21,20 +23,26 @@ my $orig = $str;
is(ref($ref), 'SCALAR', 'got a scalar reference back');
ok(utf8::valid($$ref), 'resulting string is utf8::valid');
like($$ref, qr/I can see you!/, 'we can see ourselves in output');
- like($$ref, qr/&&/, 'escaped');
+ like($$ref, qr/&&/, 'escaped &&');
my $lref = $hls->do_hl_lang(\$str, 'perl');
is($$ref, $$lref, 'do_hl_lang matches do_hl');
- use PublicInbox::Spawn qw(which);
- if (eval { require IPC::Run } && which('w3m')) {
- require File::Temp;
+ SKIP: {
+ which('w3m') or skip 'w3m(1) missing to check output', 1;
my $cmd = [ qw(w3m -T text/html -dump -config /dev/null) ];
- my ($out, $err) = ('', '');
-
- IPC::Run::run($cmd, \('<pre>'.$$ref.'</pre>'), \$out, \$err);
+ open my $in, '+>', undef or die;
+ open my $out, '+>', undef or die;
+ my $rdr = { 0 => fileno($in), 1 => fileno($out) };
+ $in->autoflush(1);
+ print $in '<pre>', $$ref, '</pre>' or die;
+ $in->seek(0, SEEK_SET) or die;
+ my $pid = spawn($cmd, undef, $rdr);
+ waitpid($pid, 0);
# expand tabs and normalize whitespace,
# w3m doesn't preserve tabs
$orig =~ s/\t/ /gs;
+ $out->seek(0, SEEK_SET) or die;
+ $out = do { local $/; <$out> };
$out =~ s/\s*\z//sg;
$orig =~ s/\s*\z//sg;
is($out, $orig, 'w3m output matches');
next prev parent reply other threads:[~2019-11-04 3:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 3:01 [PATCH 0/5] tiny test overhead reductions Eric Wong
2019-11-04 3:01 ` [PATCH 1/5] t/*.t: remove IPC::Run dependency for git commands Eric Wong
2019-11-04 3:01 ` [PATCH 2/5] t/httpd-corner.t: drop unnecessary bytes:: for length() Eric Wong
2019-11-04 3:01 ` [PATCH 3/5] t/httpd-corner.t: get rid of IPC::Run for running curl Eric Wong
2019-11-04 3:01 ` Eric Wong [this message]
2019-11-04 3:01 ` [PATCH 5/5] t/*.t: disable nntpd/httpd worker processes in most tests 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: http://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=20191104030137.4301-5-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).