From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS205100 185.220.100.0/24 X-Spam-Status: No, score=-0.0 required=3.0 tests=AWL,BAYES_00,KHOP_HELO_FCRDNS, RCVD_IN_MSPIKE_BL,RCVD_IN_MSPIKE_ZBI,RCVD_IN_PBL,RCVD_IN_SBL_CSS, RCVD_IN_XBL,SPF_FAIL,SPF_HELO_FAIL,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=no autolearn_force=no version=3.4.6 Received: from 80x24.org (tor-exit-11.zbau.f3netze.de [185.220.100.250]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 68F301F452 for ; Mon, 15 May 2023 23:17:30 +0000 (UTC) From: Eric Wong To: spew@80x24.org Subject: [PATCH 2/2] t/solver_git: drop needless `use' and Plack deps Date: Mon, 15 May 2023 23:17:18 +0000 Message-Id: <20230515231718.2414428-2-e@80x24.org> In-Reply-To: <20230515231718.2414428-1-e@80x24.org> References: <20230515231718.2414428-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: `lei (blob|rediff)' works without Plack installed, so don't put a dependency on Plack or anything related to HTTP aside from the URI module which we use everywhere. This only enables testing the solver component on systems without Plack (as the actual lei functionality has always worked without Plack). --- t/solver_git.t | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/solver_git.t b/t/solver_git.t index 9396b7a1..c210c1ee 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -1,14 +1,14 @@ #!perl -w # Copyright (C) all contributors # License: AGPL-3.0+ -use strict; -use v5.10.1; +use v5.12; use PublicInbox::TestCommon; use Cwd qw(abs_path); -require_git(2.6); +require_git v2.6; use PublicInbox::ContentHash qw(git_sha); use PublicInbox::Spawn qw(popen_rd); -require_mods(qw(DBD::SQLite Search::Xapian Plack::Util)); +require_mods(qw(DBD::SQLite Search::Xapian URI::Escape)); +require PublicInbox::SolverGit; my $rdr = { 2 => \(my $null) }; my $git_dir = xqx([qw(git rev-parse --git-common-dir)], undef, $rdr); $git_dir = xqx([qw(git rev-parse --git-dir)], undef, $rdr) if $? != 0; @@ -18,7 +18,6 @@ chomp $git_dir; # 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 Git SolverGit WWW)); my $patch2 = eml_load 't/solve/0002-rename-with-modifications.patch'; my $patch2_oid = git_sha(1, $patch2)->hexdigest; @@ -209,10 +208,11 @@ my $hinted = $res; shift @$res; shift @$hinted; is_deeply($res, $hinted, 'hints work (or did not hurt :P'); -my @psgi = qw(HTTP::Request::Common Plack::Test URI::Escape Plack::Builder); +my @psgi = qw(HTTP::Request::Common Plack::Test Plack::Builder); SKIP: { require_mods(@psgi, 7 + scalar(@psgi)); use_ok($_) for @psgi; + require PublicInbox::WWW; my $binfoo = "$ibx->{inboxdir}/binfoo.git"; my $l = "$ibx->{inboxdir}/inbox.lock"; -f $l or BAIL_OUT "BUG: $l missing: $!";