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 197191F461; Tue, 14 May 2019 04:02:22 +0000 (UTC) Date: Tue, 14 May 2019 04:02:21 +0000 From: Eric Wong To: meta@public-inbox.org Subject: [PATCH v2 4/4] tests: get rid of unnecessary Cwd module use Message-ID: <20190514040221.GA29464@ailurophile> References: <20190514033203.6160-1-e@80x24.org> <20190514033203.6160-5-e@80x24.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20190514033203.6160-5-e@80x24.org> List-Id: We only need it for tests that chdir, and maybe for ENV{PATH} portability (dash seems fine, not sure about others). v2: revert change to solver_git.t for FreeBSD 11.2 and document --- Interdiff: diff --git a/t/solver_git.t b/t/solver_git.t index 5e0d132..0b7d7c4 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -4,6 +4,7 @@ use strict; use warnings; use Test::More; use File::Temp qw(tempdir); +use Cwd qw(abs_path); require './t/common.perl'; require_git(2.6); @@ -16,6 +17,9 @@ foreach my $mod (@mods) { chomp(my $git_dir = `git rev-parse --git-dir 2>/dev/null`); plan skip_all => "$0 must be run from a git working tree" if $?; +# needed for alternates, and --absolute-git-dir is only in git 2.13+ +$git_dir = abs_path($git_dir); + use_ok "PublicInbox::$_" for (qw(Inbox V2Writable MIME Git SolverGit)); my $mainrepo = tempdir('pi-solver-XXXXXX', TMPDIR => 1, CLEANUP => 1); t/admin.t | 1 - t/cgi.t | 1 - t/git.t | 5 ++--- t/httpd-corner.t | 3 +-- t/httpd-unix.t | 3 +-- t/httpd.t | 1 - t/mda.t | 2 +- t/nntpd.t | 1 - t/solver_git.t | 2 ++ t/spamcheck_spamc.t | 1 - 10 files changed, 7 insertions(+), 13 deletions(-) diff --git a/t/admin.t b/t/admin.t index cc1e65d..b5a4383 100644 --- a/t/admin.t +++ b/t/admin.t @@ -4,7 +4,6 @@ use strict; use warnings; use Test::More; use File::Temp qw(tempdir); -# use Cwd qw(getcwd); use_ok 'PublicInbox::Admin', qw(resolve_repo_dir); my $tmpdir = tempdir('pi-admin.XXXXXX', TMPDIR => 1, CLEANUP => 1); my $git_dir = "$tmpdir/v1"; diff --git a/t/cgi.t b/t/cgi.t index aedd79e..b24bbc4 100644 --- a/t/cgi.t +++ b/t/cgi.t @@ -7,7 +7,6 @@ use warnings; use Test::More; use Email::MIME; use File::Temp qw/tempdir/; -use Cwd; eval { require IPC::Run }; plan skip_all => "missing IPC::Run for t/cgi.t" if $@; diff --git a/t/git.t b/t/git.t index 5b612b8..7edf82b 100644 --- a/t/git.t +++ b/t/git.t @@ -5,7 +5,6 @@ use warnings; use Test::More; use File::Temp qw/tempdir/; my $dir = tempdir('pi-git-XXXXXX', TMPDIR => 1, CLEANUP => 1); -use Cwd qw/getcwd/; use PublicInbox::Spawn qw(popen_rd); eval { require IPC::Run } or plan skip_all => 'IPC::Run missing'; @@ -15,7 +14,7 @@ use_ok 'PublicInbox::Git'; is(system(qw(git init -q --bare), $dir), 0, 'created git directory'); my $cmd = [ 'git', "--git-dir=$dir", 'fast-import', '--quiet' ]; - my $fi_data = getcwd().'/t/git.fast-import-data'; + my $fi_data = './t/git.fast-import-data'; ok(-r $fi_data, "fast-import data readable (or run test at top level)"); IPC::Run::run($cmd, '<', $fi_data); is($?, 0, 'fast-import succeeded'); @@ -68,7 +67,7 @@ if (1) { my $cmd = [ 'git', "--git-dir=$dir", qw(hash-object -w --stdin) ]; # need a big file, use the AGPL-3.0 :p - my $big_data = getcwd().'/COPYING'; + my $big_data = './COPYING'; ok(-r $big_data, 'COPYING readable'); my $size = -s $big_data; ok($size > 8192, 'file is big enough'); diff --git a/t/httpd-corner.t b/t/httpd-corner.t index bfa3920..7c21994 100644 --- a/t/httpd-corner.t +++ b/t/httpd-corner.t @@ -15,7 +15,6 @@ foreach my $mod (qw(Plack::Util Plack::Builder use Digest::SHA qw(sha1_hex); use File::Temp qw/tempdir/; -use Cwd qw/getcwd/; use IO::Socket; use IO::Socket::UNIX; use Fcntl qw(:seek); @@ -28,7 +27,7 @@ ok(defined mkfifo($fifo, 0777), 'created FIFO'); my $err = "$tmpdir/stderr.log"; my $out = "$tmpdir/stdout.log"; my $httpd = 'blib/script/public-inbox-httpd'; -my $psgi = getcwd()."/t/httpd-corner.psgi"; +my $psgi = "./t/httpd-corner.psgi"; my %opts = ( LocalAddr => '127.0.0.1', ReuseAddr => 1, diff --git a/t/httpd-unix.t b/t/httpd-unix.t index 2ef64df..758277c 100644 --- a/t/httpd-unix.t +++ b/t/httpd-unix.t @@ -12,11 +12,10 @@ foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) { use File::Temp qw/tempdir/; use IO::Socket::UNIX; -use Cwd qw/getcwd/; my $tmpdir = tempdir('httpd-unix-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $unix = "$tmpdir/unix.sock"; my $httpd = 'blib/script/public-inbox-httpd'; -my $psgi = getcwd() . '/t/httpd-corner.psgi'; +my $psgi = './t/httpd-corner.psgi'; my $out = "$tmpdir/out.log"; my $err = "$tmpdir/err.log"; diff --git a/t/httpd.t b/t/httpd.t index d55495f..c061031 100644 --- a/t/httpd.t +++ b/t/httpd.t @@ -9,7 +9,6 @@ foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) { plan skip_all => "$mod missing for httpd.t" if $@; } use File::Temp qw/tempdir/; -use Cwd qw/getcwd/; use IO::Socket::INET; require './t/common.perl'; diff --git a/t/mda.t b/t/mda.t index 5dbcec6..966600a 100644 --- a/t/mda.t +++ b/t/mda.t @@ -5,7 +5,7 @@ use warnings; use Test::More; use Email::MIME; use File::Temp qw/tempdir/; -use Cwd; +use Cwd qw(getcwd); use PublicInbox::MID qw(mid2path); eval { require IPC::Run }; plan skip_all => "missing IPC::Run for t/mda.t" if $@; diff --git a/t/nntpd.t b/t/nntpd.t index ec0a621..b8a84a0 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -9,7 +9,6 @@ foreach my $mod (qw(DBD::SQLite Search::Xapian)) { } require PublicInbox::SearchIdx; require PublicInbox::Msgmap; -use Cwd; use Email::Simple; use IO::Socket; use Socket qw(IPPROTO_TCP TCP_NODELAY); diff --git a/t/solver_git.t b/t/solver_git.t index 6f0ce77..0b7d7c4 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -16,6 +16,8 @@ foreach my $mod (@mods) { } chomp(my $git_dir = `git rev-parse --git-dir 2>/dev/null`); plan skip_all => "$0 must be run from a git working tree" if $?; + +# needed for alternates, and --absolute-git-dir is only in git 2.13+ $git_dir = abs_path($git_dir); use_ok "PublicInbox::$_" for (qw(Inbox V2Writable MIME Git SolverGit)); diff --git a/t/spamcheck_spamc.t b/t/spamcheck_spamc.t index 7016e8b..70de14b 100644 --- a/t/spamcheck_spamc.t +++ b/t/spamcheck_spamc.t @@ -3,7 +3,6 @@ use strict; use warnings; use Test::More; -use Cwd; use Email::Simple; use IO::File; use File::Temp qw/tempdir/; -- EW