More test updates from the core

2 files changed, 11 insertions, 4 deletions

diff --git a/t/config.t b/t/config.t
index 560addb..bd56ca5 100644
--- a/t/config.t
+++ b/t/config.t
@@ -5,6 +5,8 @@ BEGIN {
         chdir 't' if -d 't';
         @INC = '../lib';
     }
+    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;
     }
diff --git a/t/netrc.t b/t/netrc.t
index 4b67e85..d54b3c6 100644
--- a/t/netrc.t
+++ b/t/netrc.t
@@ -55,13 +55,18 @@ SKIP: {
         $stat[2] = 077;
         ok( !defined(Net::Netrc::_readrc()),
                 '_readrc() should not read world-writable file' );
-        ok( $warn =~ /^Bad permissions/, '... and should warn about it' );
+        ok( $warn =~ /^Bad permissions:/, '... and should warn about it' );
 
         # the owner field should still not match
         $stat[2] = 0;
-        ok( !defined(Net::Netrc::_readrc()),
-                '_readrc() should not read file owned by someone else' );
-        ok( $warn =~ /^Not owner/, '... and should warn about it' );
+
+        if ($<) { 
+          ok( !defined(Net::Netrc::_readrc()), 
+              '_readrc() should not read file owned by someone else' ); 
+          ok( $warn =~ /^Not owner:/, '... and should warn about it' ); 
+        } else { 
+          skip("testing as root",2);
+        } 
 }
 
 # this field must now match, to avoid the last-tested warning