[Jifty-commit] r1208 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Thu Jun  8 12:39:34 2006
New Revision: 1208

Modified:
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/Test.pm

Log:
Switch back to Test::HTTP::Server::Simple for normal testing.  Only
use the new Jifty::TestServer when profiling or collecting coverage.


Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Thu Jun  8 12:39:34 2006
@@ -46,6 +46,7 @@
 requires('Pod::Simple'); #Pod::Simple::Text
 requires('String::Koremutake');
 requires('Test::Base' => 0.44);            # Test::Base::Filter
+requires('Test::HTTP::Server::Simple' => '0.02');
 requires('Test::HTML::Lint');
 requires('Test::More' => 0.62);
 requires('Test::Pod::Coverage');

Modified: jifty/trunk/lib/Jifty/Test.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Test.pm	(original)
+++ jifty/trunk/lib/Jifty/Test.pm	Thu Jun  8 12:39:34 2006
@@ -110,8 +110,16 @@
     # server controller that invokes bin/jifty server. kill the
     # unshift here once we fix all the tests expecting it to be
     # jifty::server.
-    require Jifty::TestServer;
-    unshift @Jifty::Server::ISA, 'Jifty::TestServer';
+    if ($ENV{JIFTY_TESTSERVER_PROFILE} ||
+        $ENV{JIFTY_TESTSERVER_COVERAGE} ||
+        $ENV{JIFTY_TESTSERVER_DBIPROF}) {
+        require Jifty::TestServer;
+        unshift @Jifty::Server::ISA, 'Jifty::TestServer';
+    }
+    else {
+        require Test::HTTP::Server::Simple;
+        unshift @Jifty::Server::ISA, 'Test::HTTP::Server::Simple';
+    }
 
     my $server = Jifty::Server->new;