www: stricter regexp for 405 errors

[public-inbox.git] / t / httpd.t

diff --git a/t/httpd.t b/t/httpd.t
index ce8063b28672863fa97fa73f52b9f8b1d3f3d75e..c9756a705c67cd1c5161c69f242d410ea0c39437 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -3,17 +3,12 @@
 use strict;
 use warnings;
 use Test::More;
-
-foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for httpd.t" if $@;
-}
-use File::Temp qw/tempdir/;
+use PublicInbox::TestCommon;
 use Socket qw(IPPROTO_TCP SOL_SOCKET);
-require './t/common.perl';
+require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
 
 # FIXME: too much setup
-my $tmpdir = tempdir('pi-httpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $home = "$tmpdir/pi-home";
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
@@ -54,6 +49,11 @@ EOF
        $td = start_script($cmd, undef, { 3 => $sock });
        my $host = $sock->sockhost;
        my $port = $sock->sockport;
+       {
+               my $bad = tcp_connect($sock);
+               print $bad "GETT / HTTP/1.0\r\n\r\n" or die;
+               like(<$bad>, qr!\AHTTP/1\.[01] 405\b!, 'got 405 on bad req');
+       }
        my $conn = tcp_connect($sock);
        ok($conn, 'connected');
        ok($conn->write("GET / HTTP/1.0\r\n\r\n"), 'wrote data to socket');
@@ -86,7 +86,7 @@ EOF
 
 SKIP: {
        skip 'TCP_DEFER_ACCEPT is Linux-only', 1 if $^O ne 'linux';
-       my $var = Socket::TCP_DEFER_ACCEPT();
+       my $var = eval { Socket::TCP_DEFER_ACCEPT() } // 9;
        defined(my $x = getsockopt($sock, IPPROTO_TCP, $var)) or die;
        ok(unpack('i', $x) > 0, 'TCP_DEFER_ACCEPT set');
 };