X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=xt%2Fgit-http-backend.t;h=adadebb0a15ab7926923d736d5ea34c1282262c2;hb=5c8909925072804901e9c3b45bbf25446d379e7b;hp=a927d89ee272b63a22b4eb937e67479b58d0694e;hpb=28caef46cadc34c53e33994597de28f8e05552c0;p=public-inbox.git
diff --git a/xt/git-http-backend.t b/xt/git-http-backend.t
index a927d89e..adadebb0 100644
--- a/xt/git-http-backend.t
+++ b/xt/git-http-backend.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
#
# Ensure buffering behavior in -httpd doesn't cause runaway memory use
@@ -7,23 +7,19 @@ use strict;
use warnings;
use Test::More;
use POSIX qw(setsid);
-require './t/common.perl';
+use PublicInbox::TestCommon;
+use PublicInbox::Spawn qw(which);
my $git_dir = $ENV{GIANT_GIT_DIR};
plan 'skip_all' => 'GIANT_GIT_DIR not defined' unless $git_dir;
-foreach my $mod (qw(BSD::Resource
- Plack::Util Plack::Builder
- HTTP::Date HTTP::Status Net::HTTP)) {
- eval "require $mod";
- plan skip_all => "$mod missing for git-http-backend.t" if $@;
-}
+require_mods(qw(BSD::Resource Plack::Util Plack::Builder
+ HTTP::Date HTTP::Status Net::HTTP));
my $psgi = "./t/git-http-backend.psgi";
my ($tmpdir, $for_destroy) = tmpdir();
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
my $sock = tcp_server();
-my $host = $sock->sockhost;
-my $port = $sock->sockport;
+my ($host, $port) = tcp_host_port($sock);
my $td;
my $get_maxrss = sub {
@@ -40,7 +36,6 @@ my $get_maxrss = sub {
};
{
- ok($sock, 'sock created');
my $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err", $psgi ];
$td = start_script($cmd, undef, { 3 => $sock });
}
@@ -78,6 +73,25 @@ SKIP: {
}
}
+SKIP: { # make sure Last-Modified + If-Modified-Since works with curl
+ my $nr = 6;
+ skip 'no description', $nr unless -f "$git_dir/description";
+ my $mtime = (stat(_))[9];
+ my $curl = which('curl');
+ skip 'curl(1) not found', $nr unless $curl;
+ my $url = "http://$host:$port/description";
+ my $dst = "$tmpdir/desc";
+ is(xsys($curl, qw(-RsSf), '-o', $dst, $url), 0, 'curl -R');
+ is((stat($dst))[9], $mtime, 'curl used remote mtime');
+ is(xsys($curl, qw(-sSf), '-z', $dst, '-o', "$dst.2", $url), 0,
+ 'curl -z noop');
+ ok(!-e "$dst.2", 'no modification, nothing retrieved');
+ utime(0, 0, $dst) or die "utime failed: $!";
+ is(xsys($curl, qw(-sSfR), '-z', $dst, '-o', "$dst.2", $url), 0,
+ 'curl -z updates');
+ ok(-e "$dst.2", 'faked modification, got new file retrieved');
+}
+
{
my $c = fork;
if ($c == 0) {