tests: remove unnecessary loading of ::DS and Socket

PublicInbox::DS works for every platform we we care about,
nowadays; so checking for it is a waste of time.  Cleanup a
few POSIX and Socket imports while we're in the area.

diff --git a/t/git-http-backend.t b/t/git-http-backend.t
index b616e822bfb1fb5cfc2451673429eebce264a1c6..5ac0a4a53255f6b35ea7d96fd2adfacaa6c7f72e 100644 (file)
--- a/t/git-http-backend.t
+++ b/t/git-http-backend.t
@@ -4,21 +4,19 @@ use strict;
 use warnings;
 use Test::More;
 use File::Temp qw/tempdir/;
-use IO::Socket;
-use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-use POSIX qw(dup2 setsid);
-use Cwd qw(getcwd);
+use IO::Socket::INET;
+use POSIX qw(setsid);
 
 my $git_dir = $ENV{GIANT_GIT_DIR};
 plan 'skip_all' => 'GIANT_GIT_DIR not defined' unless $git_dir;
-foreach my $mod (qw(PublicInbox::DS BSD::Resource
+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 './t/common.perl';
-my $psgi = getcwd()."/t/git-http-backend.psgi";
+my $psgi = "./t/git-http-backend.psgi";
 my $tmpdir = tempdir('pi-git-http-backend-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 49c5d1fe567c0d8ded02cf46845d1d2664006e5d..bfa39205ccd7dc40d67559397882230e40afc73a 100644 (file)
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -7,7 +7,7 @@ use warnings;
 use Test::More;
 use Time::HiRes qw(gettimeofday tv_interval);
 
-foreach my $mod (qw(Plack::Util Plack::Builder PublicInbox::DS
+foreach my $mod (qw(Plack::Util Plack::Builder
                        HTTP::Date HTTP::Status IPC::Run)) {
        eval "require $mod";
        plan skip_all => "$mod missing for httpd-corner.t" if $@;
@@ -19,8 +19,8 @@ use Cwd qw/getcwd/;
 use IO::Socket;
 use IO::Socket::UNIX;
 use Fcntl qw(:seek);
-use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-use POSIX qw(mkfifo :sys_wait_h);
+use Socket qw(IPPROTO_TCP TCP_NODELAY);
+use POSIX qw(mkfifo);
 require './t/common.perl';
 my $tmpdir = tempdir('httpd-corner-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $fifo = "$tmpdir/fifo";

diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index 627adfafe0cad8f58cc0aa4dd8532c406bbb357e..2ef64dfcd0968921ef93f841ac646bb17a2fafae 100644 (file)
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -5,8 +5,7 @@ use strict;
 use warnings;
 use Test::More;
 
-foreach my $mod (qw(Plack::Util Plack::Builder PublicInbox::DS
-                       HTTP::Date HTTP::Status)) {
+foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
        eval "require $mod";
        plan skip_all => "$mod missing for httpd-unix.t" if $@;
 }

diff --git a/t/httpd.t b/t/httpd.t
index 45cbcbfd62117f8a3b87918463bf8f243086424d..d55495ff6137e18c296c61b7a3f60e4a682759d7 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -4,15 +4,13 @@ use strict;
 use warnings;
 use Test::More;
 
-foreach my $mod (qw(Plack::Util Plack::Builder PublicInbox::DS
-                       HTTP::Date HTTP::Status)) {
+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 Cwd qw/getcwd/;
-use IO::Socket;
-use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
+use IO::Socket::INET;
 require './t/common.perl';
 
 # FIXME: too much setup

diff --git a/t/nntp.t b/t/nntp.t
index c39a05fa23def914fe179e656fc770d66e8ac57b..47b14422af29ab3f39677d913d25b01a3f9bc182 100644 (file)
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -5,7 +5,7 @@ use warnings;
 use Test::More;
 use Data::Dumper;
 
-foreach my $mod (qw(DBD::SQLite Search::Xapian PublicInbox::DS)) {
+foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
        eval "require $mod";
        plan skip_all => "$mod missing for nntp.t" if $@;
 }

diff --git a/t/nntpd.t b/t/nntpd.t
index ecfd74f7c0c120823005ef4e88e0791821e47123..ec0a621c46f4e7724fcc51df46b0da0564ae9eab 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 use Test::More;
-foreach my $mod (qw(DBD::SQLite Search::Xapian PublicInbox::DS)) {
+foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
        eval "require $mod";
        plan skip_all => "$mod missing for nntpd.t" if $@;
 }
@@ -12,7 +12,7 @@ require PublicInbox::Msgmap;
 use Cwd;
 use Email::Simple;
 use IO::Socket;
-use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
+use Socket qw(IPPROTO_TCP TCP_NODELAY);
 use File::Temp qw/tempdir/;
 use Net::NNTP;
 use Sys::Hostname;

diff --git a/t/v2mirror.t b/t/v2mirror.t
index eaf9e61d5eb4f29d56ef06884e58c4d17189d247..441e36d75e16d503dec7f49262fde80ef5755cdf 100644 (file)
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -7,7 +7,7 @@ require './t/common.perl';
 require_git(2.6);
 
 # Integration tests for HTTP cloning + mirroring
-foreach my $mod (qw(Plack::Util Plack::Builder PublicInbox::DS
+foreach my $mod (qw(Plack::Util Plack::Builder
                        HTTP::Date HTTP::Status Search::Xapian DBD::SQLite
                        IPC::Run)) {
        eval "require $mod";

diff --git a/t/v2writable.t b/t/v2writable.t
index 75110155f3fa9bc0f0729e9acaf828740b79e0d3..5f34d12798a512d2c96515d652bf9490ac0e3119 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -127,12 +127,9 @@ if ('ensure git configs are correct') {
                'same document') if ($mset1->size);
 }
 
-SKIP: {
+{
        use Net::NNTP;
-       use IO::Socket;
-       use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-       eval { require PublicInbox::DS };
-       skip "PublicInbox::DS missing $@", 2 if $@;
+       use IO::Socket::INET;
        my $err = "$mainrepo/stderr.log";
        my $out = "$mainrepo/stdout.log";
        my %opts = (