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

[Jifty commits]

The branch, master has been updated
       via  bd0b3ca0aae7e3b86c1cde41d602bef6315e928d (commit)
      from  4a3cce8dc2e7bc621fbd338bdea0a32818174380 (commit)

Summary of changes:
 t/cas-memcached.t |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit bd0b3ca0aae7e3b86c1cde41d602bef6315e928d
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Dec 8 17:28:42 2010 -0500

    Delay Jifty::Test->import to delay the load of Jifty
    
    This sidesteps the problem of Jifty's CCJS plugin trying to generate
    content early and save it to a memcached CAS before we actually see if
    memcached is available and if the test is running or not.

diff --git a/t/cas-memcached.t b/t/cas-memcached.t
index 1be3562..9bf8b23 100644
--- a/t/cas-memcached.t
+++ b/t/cas-memcached.t
@@ -1,7 +1,8 @@
 use strict;
 use warnings;
 
-use Jifty::Test;
+use Test::More;
+require Jifty::Test;
 
 eval "use Cache::Memcached";
 plan skip_all => "Cache::Memcached required for testing CAS memcache store" if $@;
@@ -11,7 +12,9 @@ require IO::Socket::INET;
 plan skip_all => "Testing CAS memcached store requires a memcached running on the default port"
     unless IO::Socket::INET->new('127.0.0.1:11211');
 
-plan tests => 17;
+# We want to do the import since it loads up Jifty and triggers CCJS's early
+# generation trying to use memcached
+Jifty::Test->import(tests => 17);
 
 my $data    = "a" x (1024*10);
 my $databig = "a" x (1024*1024*2);

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