tests: use File::Temp->newdir instead of tempdir()

[public-inbox.git] / t / git-http-backend.t

diff --git a/t/git-http-backend.t b/t/git-http-backend.t
index e879392341d3de178e272cb482e80ef0afa9b73b..a927d89ee272b63a22b4eb937e67479b58d0694e 100644 (file)
--- a/t/git-http-backend.t
+++ b/t/git-http-backend.t
@@ -1,40 +1,30 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+#
+# Ensure buffering behavior in -httpd doesn't cause runaway memory use
+# or data corruption
 use strict;
 use warnings;
 use Test::More;
-use File::Temp qw/tempdir/;
-use IO::Socket;
-use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);
-use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-use POSIX qw(dup2 setsid);
-use Cwd qw(getcwd);
+use POSIX qw(setsid);
+require './t/common.perl';
 
 my $git_dir = $ENV{GIANT_GIT_DIR};
 plan 'skip_all' => 'GIANT_GIT_DIR not defined' unless $git_dir;
-foreach my $mod (qw(Danga::Socket
+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 $@;
 }
-my $psgi = getcwd()."/t/git-http-backend.psgi";
-my $tmpdir = tempdir('pi-git-http-backend-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $psgi = "./t/git-http-backend.psgi";
+my ($tmpdir, $for_destroy) = tmpdir();
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
-my $httpd = 'blib/script/public-inbox-httpd';
-my %opts = (
-       LocalAddr => '127.0.0.1',
-       ReuseAddr => 1,
-       Proto => 'tcp',
-       Type => SOCK_STREAM,
-       Listen => 1024,
-);
-my $sock = IO::Socket::INET->new(%opts);
+my $sock = tcp_server();
 my $host = $sock->sockhost;
 my $port = $sock->sockport;
-my $pid;
-END { kill 'TERM', $pid if defined $pid };
+my $td;
 
 my $get_maxrss = sub {
         my $http = Net::HTTP->new(Host => "$host:$port");
@@ -51,17 +41,8 @@ my $get_maxrss = sub {
 
 {
        ok($sock, 'sock created');
-       $pid = fork;
-       if ($pid == 0) { # pretend to be systemd
-               fcntl($sock, F_SETFD, 0);
-               dup2(fileno($sock), 3) or die "dup2 failed: $!\n";
-               $ENV{LISTEN_PID} = $$;
-               $ENV{LISTEN_FDS} = 1;
-               $ENV{TEST_CHUNK} = '1';
-               exec $httpd, "--stdout=$out", "--stderr=$err", $psgi;
-               die "FAIL: $!\n";
-       }
-       ok(defined $pid, 'forked httpd process successfully');
+       my $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err", $psgi ];
+       $td = start_script($cmd, undef, { 3 => $sock });
 }
 my $mem_a = $get_maxrss->();
 
@@ -87,6 +68,8 @@ SKIP: {
        my ($code, $mess, %h) = $http->read_response_headers;
        is(200, $code, 'got 200 success for pack');
        is($max, $h{'Content-Length'}, 'got expected Content-Length for pack');
+
+       # no $http->read_entity_body, here, since we want to force buffering
        foreach my $i (1..3) {
                sleep 1;
                my $diff = $get_maxrss->() - $mem_a;
@@ -126,9 +109,8 @@ SKIP: {
 }
 
 {
-       ok(kill('TERM', $pid), 'killed httpd');
-       $pid = undef;
-       waitpid(-1, 0);
+       ok($td->kill, 'killed httpd');
+       $td->join;
 }
 
 done_testing();