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

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Mon Jun 19 18:07:15 2006
New Revision: 1319

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/META.yml
   jifty/trunk/lib/Jifty/Config.pm
   jifty/trunk/lib/Jifty/Test.pm

Log:
 r14101 at zoq-fot-pik:  chmrr | 2006-06-19 18:07:09 -0400
  * Be explicit about removing the temporary test config file ourselves 


Modified: jifty/trunk/META.yml
==============================================================================
--- jifty/trunk/META.yml	(original)
+++ jifty/trunk/META.yml	Mon Jun 19 18:07:15 2006
@@ -14,7 +14,7 @@
     - inc
 requires: 
   App::CLI: 0.03
-  CSS::Squish: 0.01
+  CSS::Squish: 0.04
   Cache::Cache: 0
   Calendar::Simple: 0
   Class::Accessor: 0

Modified: jifty/trunk/lib/Jifty/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Config.pm	(original)
+++ jifty/trunk/lib/Jifty/Config.pm	Mon Jun 19 18:07:15 2006
@@ -142,16 +142,9 @@
             $self->framework('TestConfig') || $ENV{'JIFTY_TEST_CONFIG'}
         )
     );
-
     $config = Hash::Merge::merge( $self->stash, $test );
     $self->stash($config);
 
-
-
-
-
-
-
     # Merge guessed values in for anything we didn't explicitly define
     # Whatever's in the stash overrides anything we guess
     $self->stash( Hash::Merge::merge( $self->guess, $self->stash ));

Modified: jifty/trunk/lib/Jifty/Test.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Test.pm	(original)
+++ jifty/trunk/lib/Jifty/Test.pm	Mon Jun 19 18:07:15 2006
@@ -35,7 +35,7 @@
 sub setup {
     my $class = shift;
 
-    my $test_config = File::Temp->new;
+    my $test_config = File::Temp->new( UNLINK => 0 );
     Jifty::YAML::DumpFile($test_config, $class->test_config(Jifty::Config->new));
     # Invoking bin/jifty and friends will now have the test config ready.
     $ENV{'JIFTY_TEST_CONFIG'} ||= $test_config;
@@ -210,7 +210,7 @@
     }
 
     # Unlink test file
-    undef $Test->{test_config} if $Test->{test_config};
+    unlink $Test->{test_config} if $Test->{test_config};
 }
 
 1;