Changed http tests to use t/tmp instead of t/var

diff --git a/t/optional/apache-cgi.pl b/t/optional/apache-cgi.pl
index 0eac65c..7864b39 100755 (executable)
--- a/t/optional/apache-cgi.pl
+++ b/t/optional/apache-cgi.pl
@@ -18,21 +18,21 @@ use File::Copy::Recursive;
 use FindBin;
 
 # clean up
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";
+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/var";
-chdir "$FindBin::Bin/../../t/var";
+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/live/lib', 't/var/TestApp/lib' );
+File::Copy::Recursive::dircopy( 't/live/lib', 't/tmp/TestApp/lib' );
 
 # remove TestApp's tests so Apache::Test doesn't try to run them
-rmtree 't/var/TestApp/t';
+rmtree 't/tmp/TestApp/t';
 
 $ENV{CATALYST_SERVER} = 'http://localhost:8529/cgi';
 
 Apache::TestRun->new->run(@ARGV);
 
 # clean up
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";
+rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";

diff --git a/t/optional/apache-fastcgi.pl b/t/optional/apache-fastcgi.pl
index a4c2a52..68f095c 100755 (executable)
--- a/t/optional/apache-fastcgi.pl
+++ b/t/optional/apache-fastcgi.pl
@@ -18,21 +18,21 @@ use File::Copy::Recursive;
 use FindBin;
 
 # clean up
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";
+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/var";
-chdir "$FindBin::Bin/../../t/var";
+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/live/lib', 't/var/TestApp/lib' );
+File::Copy::Recursive::dircopy( 't/live/lib', 't/tmp/TestApp/lib' );
 
 # remove TestApp's tests so Apache::Test doesn't try to run them
-rmtree 't/var/TestApp/t';
+rmtree 't/tmp/TestApp/t';
 
 $ENV{CATALYST_SERVER} = 'http://localhost:8529/fastcgi';
 
 Apache::TestRun->new->run(@ARGV);
 
 # clean up
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";
+rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";

diff --git a/t/optional/http-server-restart.t b/t/optional/http-server-restart.t
index f9d4a9e..a002ee3 100644 (file)
--- a/t/optional/http-server-restart.t
+++ b/t/optional/http-server-restart.t
@@ -19,19 +19,22 @@ plan skip_all => 'File::Copy::Recursive required' if $@;
 plan tests => 40;\r
 \r
 # clean up\r
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";\r
+rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";\r
 \r
 # create a TestApp and copy the test libs into it\r
-mkdir "$FindBin::Bin/../../t/var";\r
-chdir "$FindBin::Bin/../../t/var";\r
+mkdir "$FindBin::Bin/../../t/tmp";\r
+chdir "$FindBin::Bin/../../t/tmp";\r
 system "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../script/catalyst.pl TestApp";\r
 chdir "$FindBin::Bin/../..";\r
-File::Copy::Recursive::dircopy( 't/live/lib', 't/var/TestApp/lib' );\r
+File::Copy::Recursive::dircopy( 't/live/lib', 't/tmp/TestApp/lib' );\r
+\r
+# remove TestApp's tests\r
+rmtree 't/tmp/TestApp/t';\r
 \r
 # spawn the standalone HTTP server\r
 my $port = 30000 + int rand(1 + 10000);\r
 my $pid = open my $server, \r
-    "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../t/var/TestApp/script/testapp_server.pl -port $port -restart 2>&1 |"\r
+    "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../t/tmp/TestApp/script/testapp_server.pl -port $port -restart 2>&1 |"\r
     or die "Unable to spawn standalone HTTP server: $!";\r
 \r
 # wait for it to start\r
@@ -42,9 +45,9 @@ while ( check_port( 'localhost', $port ) != 1 ) {
 \r
 # change various files\r
 my @files = (\r
-    "$FindBin::Bin/../../t/var/TestApp/lib/TestApp.pm",\r
-    "$FindBin::Bin/../../t/var/TestApp/lib/TestApp/Controller/Action/Begin.pm",\r
-    "$FindBin::Bin/../../t/var/TestApp/lib/TestApp/Controller/Engine/Request/URI.pm",\r
+    "$FindBin::Bin/../../t/tmp/TestApp/lib/TestApp.pm",\r
+    "$FindBin::Bin/../../t/tmp/TestApp/lib/TestApp/Controller/Action/Begin.pm",\r
+    "$FindBin::Bin/../../t/tmp/TestApp/lib/TestApp/Controller/Engine/Request/URI.pm",\r
 );\r
 \r
 # change some files and make sure the server restarts itself\r
@@ -93,7 +96,7 @@ kill 'INT', $pid;
 close $server;\r
 \r
 # clean up\r
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";\r
+rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";\r
 \r
 sub check_port {\r
     my ( $host, $port ) = @_;\r

diff --git a/t/optional/http-server.t b/t/optional/http-server.t
index ec03c35..a518df0 100644 (file)
--- a/t/optional/http-server.t
+++ b/t/optional/http-server.t
@@ -14,19 +14,22 @@ plan skip_all => 'File::Copy::Recursive required' if $@;
 plan tests => 1;
 
 # clean up
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";
+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/var";
-chdir "$FindBin::Bin/../../t/var";
+mkdir "$FindBin::Bin/../../t/tmp";
+chdir "$FindBin::Bin/../../t/tmp";
 system "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../script/catalyst.pl TestApp";
 chdir "$FindBin::Bin/../..";
-File::Copy::Recursive::dircopy( 't/live/lib', 't/var/TestApp/lib' );
+File::Copy::Recursive::dircopy( 't/live/lib', 't/tmp/TestApp/lib' );
+
+# remove TestApp's tests
+rmtree 't/tmp/TestApp/t';
 
 # spawn the standalone HTTP server
 my $port = 30000 + int rand(1 + 10000);
 my $pid = open my $server, 
-    "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../t/var/TestApp/script/testapp_server.pl -port $port 2>&1 |"
+    "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../t/tmp/TestApp/script/testapp_server.pl -port $port 2>&1 |"
     or die "Unable to spawn standalone HTTP server: $!";
 
 # wait for it to start
@@ -44,7 +47,7 @@ kill 'INT', $pid;
 close $server;
 
 # clean up
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";
+rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";
 
 ok( 'done' );