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

[turnstep]

Author: turnstep
Date: Sun Jan 13 15:16:32 2008
New Revision: 10541

Modified:
   DBD-Pg/trunk/t/03dbmethod.t

Log:
Minor fixes.


Modified: DBD-Pg/trunk/t/03dbmethod.t
==============================================================================
--- DBD-Pg/trunk/t/03dbmethod.t (original)
+++ DBD-Pg/trunk/t/03dbmethod.t Sun Jan 13 15:16:32 2008
@@ -12,6 +12,7 @@
 
 use strict;
 use warnings;
+use Data::Dumper;
 use Test::More;
 use DBI     ':sql_types';
 use DBD::Pg ':pg_types';
@@ -20,7 +21,7 @@
 select(($|=1,select(STDERR),$|=1)[1]);
 
 if (defined $ENV{DBI_DSN}) {
-       plan tests => 208;
+       plan tests => 207;
 }
 else {
        plan skip_all => 'Cannot run test unless DBI_DSN is defined. See the 
README file';
@@ -1153,11 +1154,9 @@
 {
        local $SIG{__WARN__} = sub {};
        $dbh->pg_getline($mtvar,100);
-       ok( 2==$dbh->ping(), 'DB handle method "ping" returns 2 when in COPY IN 
state');
-       ## FIXME
-       1 while $dbh->pg_getline($mtvar,1000);
-       ok( 2==$dbh->ping(), 'DB handle method "ping" returns 2 immediately 
after COPY IN state');
 }
+ok( 2==$dbh->ping(), 'DB handle method "ping" returns 2 when in COPY IN 
state');
+1 while $dbh->pg_getline($mtvar,1000);
 
 $dbh->do('SELECT 123');
 
@@ -1171,7 +1170,8 @@
 $dbh->disconnect();
 ok( 0==$dbh->ping(), 'DB handle method "ping" fails (returns 0) on a 
disconnected handle');
 
-$dbh = connect_database();
+$dbh = connect_database({nosetup => 1});
+
 ok( defined $dbh, 'Reconnect to the database after disconnect');
 
 #
@@ -1190,8 +1190,6 @@
 
 $dbh->do('COPY dbd_pg_test(id,pname) TO STDOUT');
 $dbh->pg_getline($mtvar,100);
-## FIXME
-$dbh->pg_getline($mtvar,100);
 ok( 2==$dbh->pg_ping(), 'DB handle method "pg_ping" returns 2 when in COPY IN 
state');
 1 while $dbh->pg_getline($mtvar,1000);
 ok( 2==$dbh->pg_ping(), 'DB handle method "pg_ping" returns 2 immediately 
after COPY IN state');