[svn:dbi] r14345 - dbi/trunk/t

Author: REHSACK
Date: Sat Aug 28 00:21:12 2010
New Revision: 14345

Modified:
   dbi/trunk/t/09trace.t
   dbi/trunk/t/19fhtrace.t

Log:
- cleanup after testing
- fix parallelism in 19fhtrace, too


Modified: dbi/trunk/t/09trace.t
==============================================================================
--- dbi/trunk/t/09trace.t	(original)
+++ dbi/trunk/t/09trace.t	Sat Aug 28 00:21:12 2010
@@ -45,7 +45,8 @@
 
 
 # Clean up when we're done.
-END { $dbh->disconnect if $dbh };
+END { $dbh->disconnect if $dbh;
+      1 while unlink $trace_file; };
 
 ## ----------------------------------------------------------------------------
 # Check the database handle attributes.

Modified: dbi/trunk/t/19fhtrace.t
==============================================================================
--- dbi/trunk/t/19fhtrace.t	(original)
+++ dbi/trunk/t/19fhtrace.t	Sat Aug 28 00:21:12 2010
@@ -17,6 +17,13 @@
 
 $|=1;
 
+our $fancylogfn = "fancylog$$.log";
+our $trace_file = "dbitrace$$.log";
+
+# Clean up when we're done.
+END { 1 while unlink $fancylogfn;
+      1 while unlink $trace_file; };
+
 package PerlIO::via::TraceDBI;
 
 our $logline;
@@ -112,7 +119,7 @@
 {
 	my $self = {};
 	my $fh = gensym();
-	open $fh, '>', 'fancylog.log';
+	open $fh, '>', $fancylogfn;
 	$self->{_fh} = $fh;
 	$self->{_buf} = '';
 	return bless $self, shift;
@@ -161,8 +168,6 @@
 
 cmp_ok($dbh->{TraceLevel}, '==', $DBI::dbi_debug & 0xF, '... checking TraceLevel attribute');
 
-my $trace_file = "dbitrace.log";
-
 1 while unlink $trace_file;
 
 my $tracefd;
@@ -294,8 +299,6 @@
 
 close $fh;
 
-1 while unlink 'fancylog.log';
-
 }
 
 1;