svn commit: r962970 - in /buildr/trunk: CHANGELOG lib/buildr/core/test.rb spec/core/test_spec.rb

[to...@apache.org]

Author: toulmean
Date: Sun Jul 11 01:32:55 2010
New Revision: 962970

URL: http://svn.apache.org/viewvc?rev=962970&view=rev
Log:
fix for BUILDR-468: test:failed does not respect test.exclude

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/core/test.rb
    buildr/trunk/spec/core/test_spec.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=962970&r1=962969&r2=962970&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Jul 11 01:32:55 2010
@@ -10,6 +10,7 @@
 * Fixed: BUILDR-436 release task should only replace "-SNAPSHOT" (spec from Jean-Philippe Caruana)
 * Fixed: BUILDR-464 Improve the versioning of Buildr (Rhett Sutphin)
 * Fixed: BUILDR-466 Rendering issue with IE on the website (Shane Witbeck)
+* Fixed: BUILDR-468 test:failed does not respect test.exclude
 
 1.4.1 (2010-07-07)
 * Added:  BUILDR-420 Support external compiler

Modified: buildr/trunk/lib/buildr/core/test.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/test.rb?rev=962970&r1=962969&r2=962970&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/test.rb (original)
+++ buildr/trunk/lib/buildr/core/test.rb Sun Jul 11 01:32:55 2010
@@ -423,7 +423,7 @@ module Buildr
     # We read the last test failures if any and return them.
     #
     def last_failures
-      @last_failures ||= failures_to.exist? ? File.read(failures_to.to_s).split('\n') : []
+      @last_failures ||= failures_to.exist? ? File.read(failures_to.to_s).split("\n") : []
     end
 
     # The path to the file that stores the time stamp of the last successful test run.
@@ -509,7 +509,6 @@ module Buildr
     # Limit running tests to those who failed the last time.
     def only_run_failed()
       @include = Array(last_failures)
-      @exclude.clear
       @forced_need = true
     end
 

Modified: buildr/trunk/spec/core/test_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/test_spec.rb?rev=962970&r1=962969&r2=962970&view=diff
==============================================================================
--- buildr/trunk/spec/core/test_spec.rb (original)
+++ buildr/trunk/spec/core/test_spec.rb Sun Jul 11 01:32:55 2010
@@ -950,8 +950,8 @@ describe 'test failed' do
     define 'foo' do
       test.using(:junit).exclude('ExcludedTest')
       test.instance_eval do
-        @framework.stub!(:tests).and_return(['FailingTest', 'ExcludedTest'])
-        @framework.stub!(:run).and_return([])
+        @framework.stub!(:tests).and_return(['FailingTest', 'PassingTest', 'ExcludedTest'])
+        @framework.stub!(:run).and_return(['PassingTest'])
       end
     end
     write project('foo').path_to(:target, "junit-failed"), "FailingTest\nExcludedTest"