From: Tomas Doran <bobtfish@bobtfish.net>
Date: Sun, 22 Jan 2012 10:46:26 +0000 (+0000)
Subject: lose the aggressive error handling - works when aggregated now
X-Git-Tag: 5.90008~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=4c0f887010ccf7163be452816bca71a3b56c7d83

lose the aggressive error handling - works when aggregated now
---

diff --git a/t/aggregate/psgi_file.t b/t/aggregate/psgi_file.t
index a06b221..0e07d21 100644
--- a/t/aggregate/psgi_file.t
+++ b/t/aggregate/psgi_file.t
@@ -22,10 +22,8 @@ TestApp->psgi_app;
 close($psgi);
 
 my ($saved_stdout, $saved_stderr);
-open( $saved_stdout, '>&'. STDOUT->fileno )
-            or croak("Can't dup stdout: $!");
-open( $saved_stderr, '>&'. STDERR->fileno )
-            or croak("Can't dup stderr: $!");
+my $stdout = !open( $saved_stdout, '>&'. STDOUT->fileno );
+my $stderr = !open( $saved_stderr, '>&'. STDERR->fileno );
 open( STDOUT, '+>', undef )
             or croak("Can't reopen stdout to /dev/null");
 open( STDERR, '+>', undef )
@@ -35,10 +33,12 @@ system($^X, '-I', "$FindBin::Bin/../lib", '-c', $path)
     ? fail('.psgi does not compile')
     : pass('.psgi compiles');
 
-open( STDOUT, '>&'. fileno($saved_stdout) )
-            or croak("Can't restore stdout: $!");
-open( STDERR, '>&'. fileno($saved_stderr) )
-            or croak("Can't restore stderr: $!");
+if ($stdout) {
+    open( STDOUT, '>&'. fileno($saved_stdout) );
+}
+if ($stderr) {
+    open( STDERR, '>&'. fileno($saved_stderr) );
+}
 
 # NOTE - YOU *CANNOT* do something like:
 #my $psgi_ref = require $path;