remove most internal Email::MIME usage

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

diff --git a/t/httpd.t b/t/httpd.t
index 517329fbc5a37db2863479a6f46975c3c17a143a..7404eb8b691156a7f820eea4310c037e8d78684f 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -1,15 +1,12 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 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 Socket qw(IPPROTO_TCP SOL_SOCKET);
 use PublicInbox::TestCommon;
+use PublicInbox::Eml;
+use Socket qw(IPPROTO_TCP SOL_SOCKET);
+require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
 
 # FIXME: too much setup
 my ($tmpdir, $for_destroy) = tmpdir();
@@ -24,7 +21,6 @@ my $sock = tcp_server();
 my $td;
 use_ok 'PublicInbox::Git';
 use_ok 'PublicInbox::Import';
-use_ok 'Email::MIME';
 {
        local $ENV{HOME} = $home;
        my $cmd = [ '-init', $group, $maindir, 'http://example.com/', $addr ];
@@ -32,7 +28,7 @@ use_ok 'Email::MIME';
 
        # ensure successful message delivery
        {
-               my $mime = Email::MIME->new(<<EOF);
+               my $mime = PublicInbox::Eml->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -53,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');
@@ -63,29 +64,29 @@ EOF
                is($conn->read($buf, 1), 0, "EOF");
        }
 
-       is(system(qw(git clone -q --mirror),
+       is(xsys(qw(git clone -q --mirror),
                        "http://$host:$port/$group", "$tmpdir/clone.git"),
                0, 'smart clone successful');
 
        # ensure dumb cloning works, too:
-       is(system('git', "--git-dir=$maindir",
+       is(xsys('git', "--git-dir=$maindir",
                qw(config http.uploadpack false)),
                0, 'disable http.uploadpack');
-       is(system(qw(git clone -q --mirror),
+       is(xsys(qw(git clone -q --mirror),
                        "http://$host:$port/$group", "$tmpdir/dumb.git"),
                0, 'clone successful');
 
        ok($td->kill, 'killed httpd');
        $td->join;
 
-       is(system('git', "--git-dir=$tmpdir/clone.git",
+       is(xsys('git', "--git-dir=$tmpdir/clone.git",
                  qw(fsck --no-verbose)), 0,
                'fsck on cloned directory successful');
 }
 
 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');
 };