From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 02/14] tests: account for missing git-http-backend
Date: Wed, 13 Dec 2023 00:50:07 +0000 [thread overview]
Message-ID: <20231213005019.26912-3-e@80x24.org> (raw)
In-Reply-To: <20231213005019.26912-1-e@80x24.org>
Alpine Linux ships git-http-backend in the `git-daemon'
package separately from `git', so we must test for its
existence before attempting to test functionality which
depends on it.
---
lib/PublicInbox/TestCommon.pm | 19 ++++++++++++++++++-
t/clone-coderepo.t | 1 +
t/httpd.t | 1 +
t/lei-mirror.t | 1 +
t/www_listing.t | 1 +
5 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index d587bf10..27a758e4 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -25,7 +25,7 @@ BEGIN {
run_script start_script key2sub xsys xsys_e xqx eml_load tick
have_xapian_compact json_utf8 setup_public_inboxes create_inbox
create_coderepo require_bsd kernel_version check_broken_tmpfs
- quit_waiter_pipe wait_for_eof
+ quit_waiter_pipe wait_for_eof require_git_http_backend
tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt
test_httpd xbail require_cmd is_xdeeply tail_f
ignore_inline_c_missing no_pollerfd no_coredump cfg_new
@@ -163,6 +163,23 @@ sub require_git ($;$) {
skip("git $req+ required (have $cur_ver), skipping $nr tests")
}
+sub require_git_http_backend (;$) {
+ my ($nr) = @_;
+ state $ok = do {
+ require PublicInbox::Git;
+ my $git = PublicInbox::Git::check_git_exe() or plan
+ skip_all => 'nothing in public-inbox works w/o git';
+ my $rdr = { 1 => \my $out, 2 => \my $err };
+ xsys([$git, qw(http-backend)], undef, $rdr);
+ $out =~ /^Status:/ism;
+ };
+ if (!$ok) {
+ my $msg = "`git http-backend' not available";
+ defined($nr) ? skip $msg, $nr : plan skip_all => $msg;
+ }
+ $ok;
+}
+
my %IPv6_VERSION = (
'Net::NNTP' => 3.00,
'Mail::IMAPClient' => 3.40,
diff --git a/t/clone-coderepo.t b/t/clone-coderepo.t
index 0e6b4ac7..c0951941 100644
--- a/t/clone-coderepo.t
+++ b/t/clone-coderepo.t
@@ -8,6 +8,7 @@ use File::Temp;
use File::Path qw(remove_tree);
use PublicInbox::SHA qw(sha1_hex);
require_mods(qw(json Plack::Builder HTTP::Date HTTP::Status));
+require_git_http_backend;
require_git '1.8.5';
require_cmd 'curl';
require_ok 'PublicInbox::LeiMirror';
diff --git a/t/httpd.t b/t/httpd.t
index 0421c7ea..c0fbaa22 100644
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -7,6 +7,7 @@ use PublicInbox::TestCommon;
use PublicInbox::Eml;
use Socket qw(IPPROTO_TCP SOL_SOCKET);
require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
+require_git_http_backend;
# FIXME: too much setup
my ($tmpdir, $for_destroy) = tmpdir();
diff --git a/t/lei-mirror.t b/t/lei-mirror.t
index 37c9751b..76041b73 100644
--- a/t/lei-mirror.t
+++ b/t/lei-mirror.t
@@ -5,6 +5,7 @@ use v5.12; use PublicInbox::TestCommon;
use PublicInbox::Inbox;
require_mods(qw(-httpd lei DBD::SQLite));
require_cmd('curl');
+require_git_http_backend;
use PublicInbox::Spawn qw(which);
require PublicInbox::Msgmap;
my $sock = tcp_server();
diff --git a/t/www_listing.t b/t/www_listing.t
index 709dbd05..0a4c79e8 100644
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -77,6 +77,7 @@ sub tiny_test {
my $td;
SKIP: {
+ require_git_http_backend 1;
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
my $alt = "$tmpdir/alt.git";
next prev parent reply other threads:[~2023-12-13 0:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 0:50 [PATCH 00/14] Alpine Linux support Eric Wong
2023-12-13 0:50 ` [PATCH 01/14] t/io: strace is optional on Linux Eric Wong
2023-12-13 0:50 ` Eric Wong [this message]
2023-12-13 0:50 ` [PATCH 03/14] t/cindex*: skip --join when join(1) is missing Eric Wong
2023-12-13 0:50 ` [PATCH 04/14] tests: attempt compatibility w/ busybox lsof Eric Wong
2023-12-13 0:50 ` [PATCH 05/14] lei inspect: drop unneeded strftime import Eric Wong
2023-12-13 0:50 ` [PATCH 06/14] treewide: avoid strftime %k for portability Eric Wong
2023-12-13 0:50 ` [PATCH 07/14] xap_helper_cxx: decouple from Inline::C Eric Wong
2023-12-13 0:50 ` [PATCH 08/14] xap_helper_cxx: support clang w/o `c++' executable Eric Wong
2023-12-13 0:50 ` [PATCH 09/14] install: updates for Alpine Linux and apk Eric Wong
2023-12-13 0:50 ` [PATCH 10/14] test_common: extract oct_is from search.t Eric Wong
2023-12-13 0:50 ` [PATCH 11/14] t/convert-compact: allow S_ISGID bit Eric Wong
2023-12-13 0:50 ` [PATCH 12/14] www_coderepo: fix read buffering Eric Wong
2023-12-13 0:50 ` [PATCH 13/14] gzip_filter: use OO ->zflush dispatch Eric Wong
2023-12-13 0:50 ` [PATCH 14/14] t/lei-import: relax EIO regexp 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=20231213005019.26912-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).