[svn:DBD-Pg] r11165 - DBD-Pg/trunk/t

[turnstep]

Author: turnstep
Date: Thu May  1 05:08:29 2008
New Revision: 11165

Modified:
   DBD-Pg/trunk/t/dbdpg_test_setup.pl

Log:
Make netstat more portable, check tcp connections as well.


Modified: DBD-Pg/trunk/t/dbdpg_test_setup.pl
==============================================================================
--- DBD-Pg/trunk/t/dbdpg_test_setup.pl  (original)
+++ DBD-Pg/trunk/t/dbdpg_test_setup.pl  Thu May  1 05:08:29 2008
@@ -268,7 +268,7 @@
                ## If we've got netstat available, we'll trust that
                $info = '';
                eval {
-                       $info = qx{netstat -lnx};
+                       $info = qx{netstat -na 2>&1};
                };
                if ($@) {
                        warn "netstat call failed, trying port $testport\n";
@@ -278,7 +278,8 @@
                        $testport = 5440;
                        my $maxport = 5470;
                        {
-                               last if $info !~ /PGSQL\.$testport$/m;
+                               last if $info !~ /PGSQL\.$testport$/m
+                                       and $info !~ 
/\b127\.0\.0\.1:$testport\b/m;
                                last if ++$testport >= $maxport;
                                redo;
                        }
@@ -287,7 +288,6 @@
                                last GETHANDLE;
                        }
                }
-
                $@ = '';
                ## Change to this new port and fire it up
                my $conf = "$test_database_dir/postgresql.conf";