Remove t/libnet_t.pl

Use the Test::More versions of the subroutines provided by this script, removing the need for it at all. Based on a patch by jkeenan in PR#39. Also add missing skip messages, and add missing skips in ipv6 and ssl test scripts.
steve-m-hay · Nov 28, 2020 · 1e76e0d · 1e76e0d
1 parent 25ba79a
commit 1e76e0d
Show file tree

Hide file tree

Showing 18 changed files with 134 additions and 96 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -38,7 +38,6 @@ t/external/pop3-ssl.t                    Test script
 t/external/smtp-ssl.t                    Test script
 t/ftp.t                                  Test script
 t/hostname.t                             Test script
-t/libnet_t.pl                            Test script
 t/netrc.t                                Test script
 t/nntp.t                                 Test script
 t/nntp_ipv6.t                            Test script

diff --git a/t/config.t b/t/config.t
@@ -5,15 +5,21 @@ use 5.008001;
 use strict;
 use warnings;
 
+use Test::More;
+
 BEGIN {
     if (!eval { require Socket }) {
-        print "1..0 # no Socket\n"; exit 0;
+        plan skip_all => "no Socket";
+    }
+    elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        plan skip_all => "EBCDIC but no Convert::EBCDIC";
+    }
+    else {
+        plan tests => 10;
     }
+
     undef *{Socket::inet_aton};
     undef *{Socket::inet_ntoa};
-    if (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
-        print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0;
-    }
     $INC{'Socket.pm'} = 1;
 }
 
@@ -45,13 +51,8 @@ sub inet_ntoa {
         return $names{$_[0]};
 }
 
-package main;
-
 
-(my $libnet_t = __FILE__) =~ s/config.t/libnet_t.pl/;
-require $libnet_t;
-
-print "1..10\n";
+package main;
 
 use Net::Config;
 ok( exists $INC{'Net/Config.pm'}, 'Net::Config should have been used' );

diff --git a/t/datasend.t b/t/datasend.t
@@ -5,12 +5,17 @@ use 5.008001;
 use strict;
 use warnings;
 
+use Test::More;
+
 BEGIN {
     if (!eval { require Socket }) {
-        print "1..0 # no Socket\n"; exit 0;
+        plan skip_all => "no Socket";
+    }
+    elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        plan skip_all => "EBCDIC but no Convert::EBCDIC";
     }
-    if (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
-        print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0;
+    else {
+        plan tests => 54;
     }
 }
 
@@ -41,11 +46,6 @@ BEGIN {
   }
 }
 
-(my $libnet_t = __FILE__) =~ s/datasend.t/libnet_t.pl/;
-require $libnet_t or die;
-
-print "1..54\n";
-
 sub check {
   my $expect = pop;
   my $cmd = Foo->new;

diff --git a/t/ftp.t b/t/ftp.t
@@ -7,7 +7,7 @@ use warnings;
 
 BEGIN {
     if (!eval { require Socket }) {
-        print "1..0 # Skip: no Socket module\n"; exit 0;
+        print "1..0 # Skip: no Socket\n"; exit 0;
     }
     if (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
         print "1..0 # Skip: EBCDIC but no Convert::EBCDIC\n"; exit 0;

diff --git a/t/hostname.t b/t/hostname.t
@@ -7,18 +7,18 @@ use warnings;
 
 BEGIN {
     if (!eval { require Socket }) {
-        print "1..0 # no Socket\n"; exit 0;
+        print "1..0 # Skip: no Socket\n"; exit 0;
     }
     if (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
-        print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0;
+        print "1..0 # Skip: EBCDIC but no Convert::EBCDIC\n"; exit 0;
     }
 }
 
 use Net::Domain qw(hostname domainname hostdomain hostfqdn);
 use Net::Config;
 
 unless($NetConfig{test_hosts}) {
-    print "1..0\n";
+    print "1..0 # Skip: test_hosts not enabled in config\n";
     exit 0;
 }
 

diff --git a/t/libnet_t.pl b/t/libnet_t.pl
diff --git a/t/netrc.t b/t/netrc.t
@@ -5,17 +5,21 @@ use 5.008001;
 use strict;
 use warnings;
 
+use Test::More;
+
 BEGIN {
     if (!eval { require Socket }) {
-        print "1..0 # no Socket\n"; exit 0;
+        plan skip_all => "no Socket";
+    }
+    elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        plan skip_all => "EBCDIC but no Convert::EBCDIC";
     }
-    if (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
-        print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0;
+    else {
+        plan tests => 20;
     }
 }
 
 use Cwd;
-print "1..20\n";
 
 # for testing _readrc
 $ENV{HOME} = Cwd::cwd();
@@ -36,9 +40,6 @@ my @stat;
 # for testing _readrc
 $INC{'FileHandle.pm'} = 1;
 
-(my $libnet_t = __FILE__) =~ s/\w+.t$/libnet_t.pl/;
-require $libnet_t;
-
 # now that the tricks are out of the way...
 eval { require Net::Netrc; };
 ok( !$@, 'should be able to require() Net::Netrc safely' );

diff --git a/t/nntp.t b/t/nntp.t
@@ -7,19 +7,24 @@ use warnings;
 
 BEGIN {
     if (!eval { require Socket }) {
-        print "1..0 # no Socket\n"; exit 0;
+        print "1..0 # Skip: no Socket\n"; exit 0;
     }
     if (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
-        print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0;
+        print "1..0 # Skip: EBCDIC but no Convert::EBCDIC\n"; exit 0;
     }
 }
 
 use Net::Config;
 use Net::NNTP;
 use Net::Cmd qw(CMD_REJECT);
 
-unless(@{$NetConfig{nntp_hosts}} && $NetConfig{test_hosts}) {
-    print "1..0\n";
+unless(@{$NetConfig{nntp_hosts}}) {
+    print "1..0 # Skip: no nntp_hosts defined in config\n";
+    exit;
+}
+
+unless($NetConfig{test_hosts}) {
+    print "1..0 # Skip: test_hosts not enabled in config\n";
     exit;
 }
 

diff --git a/t/nntp_ipv6.t b/t/nntp_ipv6.t
@@ -5,10 +5,20 @@ use 5.008001;
 use strict;
 use warnings;
 
+use Test::More;
+
+BEGIN {
+    if (!eval { require Socket }) {
+        plan skip_all => "no Socket";
+    }
+    elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        plan skip_all => "EBCDIC but no Convert::EBCDIC";
+    }
+}
+
 use Config;
 use File::Temp 'tempfile';
 use Net::NNTP;
-use Test::More;
 
 my $debug = 0; # Net::NNTP->new( Debug => .. )
 

diff --git a/t/nntp_ssl.t b/t/nntp_ssl.t
@@ -5,10 +5,20 @@ use 5.008001;
 use strict;
 use warnings;
 
+use Test::More;
+
+BEGIN {
+    if (!eval { require Socket }) {
+        plan skip_all => "no Socket";
+    }
+    elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        plan skip_all => "EBCDIC but no Convert::EBCDIC";
+    }
+}
+
 use Config;
 use File::Temp 'tempfile';
 use Net::NNTP;
-use Test::More;
 
 my $debug = 0; # Net::NNTP Debug => ..
 

diff --git a/t/pod_coverage.t b/t/pod_coverage.t
@@ -7,7 +7,7 @@
 #   Test script to check POD coverage.
 #
 # COPYRIGHT
-#   Copyright (C) 2014, 2015 Steve Hay.  All rights reserved.
+#   Copyright (C) 2014, 2015, 2020 Steve Hay.  All rights reserved.
 #
 # LICENCE
 #   This script is free software; you can redistribute it and/or modify it under
@@ -43,6 +43,12 @@ MAIN: {
     elsif ($Test::Pod::Coverage::VERSION < 0.08) {
         plan skip_all => 'Test::Pod::Coverage 0.08 or higher required to test POD coverage';
     }
+    elsif (!eval { require Socket }) {
+        plan skip_all => 'no Socket';
+    }
+    elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        plan skip_all => 'EBCDIC but no Convert::EBCDIC';
+    }
     else {
         plan tests => 12;
         my $params = { coverage_class => qw(Pod::Coverage::CountParents) };

diff --git a/t/pop3_ipv6.t b/t/pop3_ipv6.t
@@ -5,10 +5,20 @@ use 5.008001;
 use strict;
 use warnings;
 
+use Test::More;
+
+BEGIN {
+    if (!eval { require Socket }) {
+        plan skip_all => "no Socket";
+    }
+    elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        plan skip_all => "EBCDIC but no Convert::EBCDIC";
+    }
+}
+
 use Config;
 use File::Temp 'tempfile';
 use Net::POP3;
-use Test::More;
 
 my $debug = 0; # Net::POP3->new( Debug => .. )
 

diff --git a/t/pop3_ssl.t b/t/pop3_ssl.t
@@ -5,10 +5,20 @@ use 5.008001;
 use strict;
 use warnings;
 
+use Test::More;
+
+BEGIN {
+    if (!eval { require Socket }) {
+        plan skip_all => "no Socket";
+    }
+    elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        plan skip_all => "EBCDIC but no Convert::EBCDIC";
+    }
+}
+
 use Config;
 use File::Temp 'tempfile';
 use Net::POP3;
-use Test::More;
 
 my $debug = 0; # Net::POP3 Debug => ..
 

diff --git a/t/require.t b/t/require.t
@@ -7,10 +7,10 @@ use warnings;
 
 BEGIN {
     if (!eval { require Socket }) {
-        print "1..0 # no Socket\n"; exit 0;
+        print "1..0 # Skip: no Socket\n"; exit 0;
     }
     if (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
-        print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0;
+        print "1..0 # Skip: EBCDIC but no Convert::EBCDIC\n"; exit 0;
     }
 }
 

diff --git a/t/smtp.t b/t/smtp.t
@@ -7,18 +7,23 @@ use warnings;
 
 BEGIN {
     if (!eval { require Socket }) {
-        print "1..0 # no Socket\n"; exit 0;
+        print "1..0 # Skip: no Socket\n"; exit 0;
     }
-    if (ord('A') == 193 && eval { require Convert::EBCDIC }) {
-        print "1..0 # EBCDIC but no Convert::EBCDIC\n"; exit 0;
+    if (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        print "1..0 # Skip: EBCDIC but no Convert::EBCDIC\n"; exit 0;
     }
 }
 
 use Net::Config;
 use Net::SMTP;
 
-unless(@{$NetConfig{smtp_hosts}} && $NetConfig{test_hosts}) {
-    print "1..0\n";
+unless(@{$NetConfig{smtp_hosts}}) {
+    print "1..0 # Skip: no smtp_hosts defined in config\n";
+    exit 0;
+}
+
+unless($NetConfig{test_hosts}) {
+    print "1..0 # Skip: test_hosts not enabled in config\n";
     exit 0;
 }
 

diff --git a/t/smtp_ipv6.t b/t/smtp_ipv6.t
@@ -5,10 +5,20 @@ use 5.008001;
 use strict;
 use warnings;
 
+use Test::More;
+
+BEGIN {
+    if (!eval { require Socket }) {
+        plan skip_all => "no Socket";
+    }
+    elsif (ord('A') == 193 && !eval { require Convert::EBCDIC }) {
+        plan skip_all => "EBCDIC but no Convert::EBCDIC";
+    }
+}
+
 use Config;
 use File::Temp 'tempfile';
 use Net::SMTP;
-use Test::More;
 
 my $debug = 0; # Net::SMTP->new( Debug => .. )