[Catalyst-commits] r6656 - trunk/Catalyst-Runtime/t

[andyg at dev.catalyst.perl.org]

Author: andyg
Date: 2007-08-13 14:01:09 +0100 (Mon, 13 Aug 2007)
New Revision: 6656

Added:
   trunk/Catalyst-Runtime/t/optional_apache-fastcgi-non-root.pl
Removed:
   trunk/Catalyst-Runtime/t/optional_apache-fastcgi-non-root.t
Log:
Rename the Apache FastCGI non-root test so it's not a real test

Copied: trunk/Catalyst-Runtime/t/optional_apache-fastcgi-non-root.pl (from rev 6655, trunk/Catalyst-Runtime/t/optional_apache-fastcgi-non-root.t)
===================================================================
--- trunk/Catalyst-Runtime/t/optional_apache-fastcgi-non-root.pl	                        (rev 0)
+++ trunk/Catalyst-Runtime/t/optional_apache-fastcgi-non-root.pl	2007-08-13 13:01:09 UTC (rev 6656)
@@ -0,0 +1,65 @@
+#!perl
+
+# Run all tests against FastCGI mode under Apache
+#
+# Note, to get this to run properly, you may need to give it the path to your
+# httpd.conf:
+#
+# perl t/optional_apache-fastcgi-non-root.pl -httpd_conf /etc/apache/httpd.conf
+
+use strict;
+use warnings;
+
+use Apache::Test;
+use Apache::TestRun ();
+
+use File::Path;
+use File::Copy::Recursive;
+use FindBin;
+use IO::Socket;
+
+# clean up
+rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
+
+# create a TestApp and copy the test libs into it
+mkdir "$FindBin::Bin/../t/tmp";
+chdir "$FindBin::Bin/../t/tmp";
+system "$FindBin::Bin/../script/catalyst.pl TestApp";
+chdir "$FindBin::Bin/..";
+File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
+
+# remove TestApp's tests so Apache::Test doesn't try to run them
+rmtree 't/tmp/TestApp/t';
+
+$ENV{CATALYST_SERVER} = 'http://localhost:8529/fastcgi/deep/path';
+
+if ( !-e 't/optional_apache-fastcgi.pl' ) {
+    die "ERROR: Please run test from the Catalyst-Runtime directory\n";
+}
+
+push @ARGV, glob( 't/live_*' );
+
+Apache::TestRun->new->run(@ARGV);
+
+# clean up if the server has shut down
+# this allows the test files to stay around if the user ran -start-httpd
+if ( !check_port( 'localhost', 8529 ) ) {
+    rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
+}
+
+sub check_port {
+    my ( $host, $port ) = @_;
+
+    my $remote = IO::Socket::INET->new(
+        Proto    => "tcp",
+        PeerAddr => $host,
+        PeerPort => $port
+    );
+    if ($remote) {
+        close $remote;
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}

Deleted: trunk/Catalyst-Runtime/t/optional_apache-fastcgi-non-root.t
===================================================================
--- trunk/Catalyst-Runtime/t/optional_apache-fastcgi-non-root.t	2007-08-13 11:44:36 UTC (rev 6655)
+++ trunk/Catalyst-Runtime/t/optional_apache-fastcgi-non-root.t	2007-08-13 13:01:09 UTC (rev 6656)
@@ -1,65 +0,0 @@
-#!perl
-
-# Run all tests against FastCGI mode under Apache
-#
-# Note, to get this to run properly, you may need to give it the path to your
-# httpd.conf:
-#
-# perl t/optional_apache-fastcgi-non-root.pl -httpd_conf /etc/apache/httpd.conf
-
-use strict;
-use warnings;
-
-use Apache::Test;
-use Apache::TestRun ();
-
-use File::Path;
-use File::Copy::Recursive;
-use FindBin;
-use IO::Socket;
-
-# clean up
-rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
-
-# create a TestApp and copy the test libs into it
-mkdir "$FindBin::Bin/../t/tmp";
-chdir "$FindBin::Bin/../t/tmp";
-system "$FindBin::Bin/../script/catalyst.pl TestApp";
-chdir "$FindBin::Bin/..";
-File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
-
-# remove TestApp's tests so Apache::Test doesn't try to run them
-rmtree 't/tmp/TestApp/t';
-
-$ENV{CATALYST_SERVER} = 'http://localhost:8529/fastcgi/deep/path';
-
-if ( !-e 't/optional_apache-fastcgi.pl' ) {
-    die "ERROR: Please run test from the Catalyst-Runtime directory\n";
-}
-
-push @ARGV, glob( 't/live_*' );
-
-Apache::TestRun->new->run(@ARGV);
-
-# clean up if the server has shut down
-# this allows the test files to stay around if the user ran -start-httpd
-if ( !check_port( 'localhost', 8529 ) ) {
-    rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
-}
-
-sub check_port {
-    my ( $host, $port ) = @_;
-
-    my $remote = IO::Socket::INET->new(
-        Proto    => "tcp",
-        PeerAddr => $host,
-        PeerPort => $port
-    );
-    if ($remote) {
-        close $remote;
-        return 1;
-    }
-    else {
-        return 0;
-    }
-}