[Jifty-commit] jifty branch, master, updated. c07dc5eada73ee7b37da746634e40d39413f4e08

[Jifty commits]

The branch, master has been updated
       via  c07dc5eada73ee7b37da746634e40d39413f4e08 (commit)
      from  0007d4b45b203b661bb9a2310561beb93857d2c3 (commit)

Summary of changes:
 lib/Jifty/Test.pm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit c07dc5eada73ee7b37da746634e40d39413f4e08
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Mon May 3 01:18:51 2010 +0800

    if test requires actual server, default to Standalone test server.

diff --git a/lib/Jifty/Test.pm b/lib/Jifty/Test.pm
index 0a681c7..2ba5b00 100644
--- a/lib/Jifty/Test.pm
+++ b/lib/Jifty/Test.pm
@@ -206,7 +206,8 @@ sub setup {
         $ENV{JIFTY_TEST_SERVER} ||= 'Standalone';
     }
 
-    my $server = $ENV{JIFTY_TEST_SERVER} ||= 'Inline';
+    my $server = $ENV{JIFTY_TEST_SERVER} ||=
+        $args{actual_server} ? 'Standalone' : 'Inline';
 
     if ($server eq 'Inline') {
         require Jifty::Test::WWW::Mechanize;

-----------------------------------------------------------------------