[svn:DBD-Pg] r11340 - in DBD-Pg/trunk: . t

Author: turnstep
Date: Wed May 28 13:14:59 2008
New Revision: 11340

Modified:
   DBD-Pg/trunk/Changes
   DBD-Pg/trunk/t/04misc.t

Log:
Handle Windows newlines in File::Temp tracing tests.
Thanks to Ian Macdonald.


Modified: DBD-Pg/trunk/Changes
==============================================================================
--- DBD-Pg/trunk/Changes	(original)
+++ DBD-Pg/trunk/Changes	Wed May 28 13:14:59 2008
@@ -6,6 +6,8 @@
 		via $dbh->pg_notifies() [GSM]
 	- Fixed problem preventing some pg_type bind_arrays
 		from working [GSM]
+	- Fix tests in t.04misc.t to handle Windows newlines.
+		(CPAN bug #36237) [Ian Macdonald]
 
 2.7.2 Released May 14, 2008 (subversion r11269)
 

Modified: DBD-Pg/trunk/t/04misc.t
==============================================================================
--- DBD-Pg/trunk/t/04misc.t	(original)
+++ DBD-Pg/trunk/t/04misc.t	Wed May 28 13:14:59 2008
@@ -91,7 +91,7 @@
 	$dbh->commit();
 	$dbh->trace(0);
 	seek $fh,0,0;
-	{ local $/; $info = <$fh>; }
+	{ local $/; ($info = <$fh>) =~ s/\r//go; }
 	$expected = qq{begin;\n\n$SQL;\n\ncommit;\n\n};
 	is($info, $expected, $t);
 
@@ -103,7 +103,7 @@
 	$dbh->commit();
 	$dbh->trace(0);
 	seek $fh,0,0;
-	{ local $/; $info = <$fh>; }
+	{ local $/; ($info = <$fh>) =~ s/\r//go; }
 	$expected = q{PQexec
 PQresultStatus
 PQresultErrorField
@@ -130,7 +130,7 @@
 	$dbh->commit();
 	$dbh->trace(0);
 	seek $fh,0,0;
-	{ local $/; $info = <$fh>; }
+	{ local $/; ($info = <$fh>) =~ s/\r//go; }
 	$expected = q{Begin pg_quickexec (query: SELECT 'dbdpg_flag_testing' async: 0 async_status: 0)
 Begin _result (sql: begin)
 Begin _sqlstate
@@ -151,7 +151,7 @@
 	$dbh->commit();
 	$dbh->trace(0);
 	seek $fh,0,0;
-	{ local $/; $info = <$fh>; }
+	{ local $/; ($info = <$fh>) =~ s/\r//go; }
 	$expected = q{dbdpg: Begin pg_quickexec (query: SELECT 'dbdpg_flag_testing' async: 0 async_status: 0)
 dbdpg: Begin _result (sql: begin)
 dbdpg: Begin _sqlstate
@@ -172,7 +172,7 @@
 	$dbh->commit();
 	$dbh->trace(0);
 	seek $fh,0,0;
-	{ local $/; $info = <$fh>; }
+	{ local $/; ($info = <$fh>) =~ s/\r//go; }
 	$expected = q{End _sqlstate (imp_dbh->sqlstate: 00000)
 End _sqlstate (status: 1)
 End _result
@@ -211,7 +211,7 @@
 	$dbh->disconnect();
 	DBI->trace(0);
 	seek $fh,0,0;
-	{ local $/; $info = <$fh>; }
+	{ local $/; ($info = <$fh>) =~ s/\r//go; }
 	$expected = q{Login connection string: 
 Connection complete
 Disconnection complete
@@ -227,7 +227,7 @@
 	$dbh->disconnect();
 	DBI->trace(0);
 	seek $fh,0,0;
-	{ local $/; $info = <$fh>; }
+	{ local $/; ($info = <$fh>) =~ s/\r//go; }
 	$expected = q{Login connection string: 
 Connection complete
 Disconnection complete
@@ -247,7 +247,7 @@
 	$dbh->trace(0);
 	$dbh->rollback();
 	seek $fh,0,0;
-	{ local $/; $info = <$fh>; }
+	{ local $/; ($info = <$fh>) =~ s/\r//go; }
 	$expected = q{Login connection string: 
 Connection complete
 dbdpg: Begin pg_quickexec (query: SELECT 'dbdpg_flag_testing' async: 0 async_status: 0)