From 17f399e886c82f734a755c5115c5deb030c3ea3c Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 30 Sep 2022 09:21:37 +0000 Subject: [PATCH] tests: favor 3 argument `open' with interopolation It makes code easier to review, and is more robust in case some weirdos actually start their path names with '<' or '>' :P --- t/hl_mod.t | 4 ++-- t/lei-up.t | 8 ++++---- t/lei_to_mail.t | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/t/hl_mod.t b/t/hl_mod.t index a88f6c03..6ddbb778 100644 --- a/t/hl_mod.t +++ b/t/hl_mod.t @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# Copyright (C) 2019-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ use strict; use v5.10.1; use PublicInbox::TestCommon; use IO::Handle; # ->autoflush use Fcntl qw(:seek); @@ -11,7 +11,7 @@ is($hls->_shebang2lang(\"#!/usr/bin/perl -w\n"), 'perl', 'perl shebang OK'); is($hls->{-ext2lang}->{'pm'}, 'perl', '.pm suffix OK'); is($hls->{-ext2lang}->{'pl'}, 'perl', '.pl suffix OK'); like($hls->_path2lang('Makefile'), qr/\Amake/, 'Makefile OK'); -my $str = do { local $/; open(my $fh, __FILE__); <$fh> }; +my $str = do { local $/; open(my $fh, '<', __FILE__); <$fh> }; my $orig = $str; { diff --git a/t/lei-up.t b/t/lei-up.t index fc369156..022ebc05 100644 --- a/t/lei-up.t +++ b/t/lei-up.t @@ -15,23 +15,23 @@ test_lei(sub { $s = eml_load('t/utf8.eml')->as_string; lei_ok [qw(import -q -F eml -)], undef, { 0 => \$s, %$lei_opt }; lei_ok qw(up --all=local); - open my $fh, "$ENV{HOME}/a.mbox.gz" or xbail "open: $!"; + open my $fh, '<', "$ENV{HOME}/a.mbox.gz" or xbail "open: $!"; my $gz = do { local $/; <$fh> }; my $uc; gunzip(\$gz => \$uc, MultiStream => 1) or xbail "gunzip $GunzipError"; - open $fh, "$ENV{HOME}/a" or xbail "open: $!"; + open $fh, '<', "$ENV{HOME}/a" or xbail "open: $!"; my $exp = do { local $/; <$fh> }; is($uc, $exp, 'compressed and uncompressed match (a.gz)'); like($exp, qr/testmessage\@example.com/, '2nd message added'); - open $fh, "$ENV{HOME}/b.mbox.gz" or xbail "open: $!"; + open $fh, '<', "$ENV{HOME}/b.mbox.gz" or xbail "open: $!"; $gz = do { local $/; <$fh> }; undef $uc; gunzip(\$gz => \$uc, MultiStream => 1) or xbail "gunzip $GunzipError"; is($uc, $exp, 'compressed and uncompressed match (b.gz)'); - open $fh, "$ENV{HOME}/b" or xbail "open: $!"; + open $fh, '<', "$ENV{HOME}/b" or xbail "open: $!"; $uc = do { local $/; <$fh> }; is($uc, $exp, 'uncompressed both match'); diff --git a/t/lei_to_mail.t b/t/lei_to_mail.t index e8958c64..d692751c 100644 --- a/t/lei_to_mail.t +++ b/t/lei_to_mail.t @@ -1,5 +1,5 @@ #!perl -w -# Copyright (C) 2020-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ use strict; use v5.10.1; @@ -260,7 +260,7 @@ SKIP: { # FIFO support my @f; $mdr->maildir_each_file($md, sub { push @f, shift }); - open my $fh, $f[0] or BAIL_OUT $!; + open my $fh, '<', $f[0] or BAIL_OUT $!; is(do { local $/; <$fh> }, $buf, 'wrote to Maildir'); $wcb = $wcb_get->('maildir', $md); @@ -271,7 +271,7 @@ SKIP: { # FIFO support $mdr->maildir_each_file($md, sub { push @x, shift }); is(scalar(@x), 1, 'wrote one new file'); ok(!-f $f[0], 'old file clobbered'); - open $fh, $x[0] or BAIL_OUT $!; + open $fh, '<', $x[0] or BAIL_OUT $!; is(do { local $/; <$fh> }, $buf."\nx\n", 'wrote new file to Maildir'); local $lei->{opt}->{augment} = 1; @@ -283,9 +283,9 @@ SKIP: { # FIFO support is(scalar grep(/\A\Q$x[0]\E\z/, @f), 1, 'old file still there'); my @new = grep(!/\A\Q$x[0]\E\z/, @f); is(scalar @new, 1, '1 new file written (b4dc0ffee skipped)'); - open $fh, $x[0] or BAIL_OUT $!; + open $fh, '<', $x[0] or BAIL_OUT $!; is(do { local $/; <$fh> }, $buf."\nx\n", 'old file untouched'); - open $fh, $new[0] or BAIL_OUT $!; + open $fh, '<', $new[0] or BAIL_OUT $!; is(do { local $/; <$fh> }, $buf."\ny\n", 'new file written'); } -- 2.44.0