deep_test 1.1.1 → 1.1.2

data/CHANGELOG

@@ -1,8 +1,12 @@
+* 1.1.2 (February 9, 2008)
+
+* Fix bug with run_test_suite script not exiting with correct exit code.
+
 * 1.1.1 (February 9, 2008)
 
 * No longer fork from Rake process.
 
-* 1.1.0
+* 1.1.0 (December 23, 2007)
 
 * DeepTest::TestTask#processes= is now DeepTest::TestTask#number_of_workers=
 * No longer depend on the Daemons gem, use DeepTest::Warlock instead.

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/contrib/sshpublisher'
 $LOAD_PATH << File.dirname(__FILE__) + "/lib"
 require "deep_test/rake_tasks"
 
-task :default => %w[test deep_test]
+task :default => %w[test failing_test deep_test]
 
 Rake::TestTask.new do |t|
   t.pattern = "test/**/*_test.rb"
@@ -18,6 +18,22 @@ DeepTest::TestTask.new :deep_test do |t|
   t.pattern = "test/**/*_test.rb"
 end
 
+DeepTest::TestTask.new :deep_test_failing do |t|
+  t.number_of_workers = 1
+  t.pattern = "test/failing.rb"
+end
+
+# TODO: figure out a better way to test this that doesn't
+#       involve having a failing test in the output of 'rake test'
+task :failing_test do
+  exception = nil
+  begin
+    Rake::Task[:deep_test_failing].invoke
+  rescue => exception
+  end
+  fail "exception should not be nil" if exception.nil?
+end
+
 desc "Generate documentation"
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = "doc"
@@ -37,7 +53,7 @@ specification = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 	s.name   = "deep_test"
   s.summary = "DeepTest runs tests in multiple processes."
-	s.version = "1.1.1"
+	s.version = "1.1.2"
 	s.author = "anonymous z, Dan Manges, David Vollbracht"
 	s.description = s.summary
 	s.email = "daniel.manges@gmail.com"

data/lib/deep_test/loader.rb

@@ -8,9 +8,7 @@ module DeepTest
     def self.run
       require "deep_test"
       suite = Test::Unit::AutoRunner::COLLECTORS[:objectspace].call NO_FILTERS
-      blackboard = DeepTest::RindaBlackboard.new
-      supervisor = DeepTest::Supervisor.new blackboard
-      supervised_suite = DeepTest::SupervisedTestSuite.new(suite, supervisor)
+      supervised_suite = DeepTest::SupervisedTestSuite.new(suite)
       require 'test/unit/ui/console/testrunner'
       result = Test::Unit::UI::Console::TestRunner.run(supervised_suite, Test::Unit::UI::NORMAL)
       Test::Unit.run = true

data/lib/deep_test/supervised_test_suite.rb

@@ -1,6 +1,6 @@
 module DeepTest
   class SupervisedTestSuite
-    def initialize(suite, supervisor)
+    def initialize(suite, supervisor = DeepTest::Supervisor.new)
       @suite = suite
       @supervisor = supervisor
     end

data/lib/deep_test/supervisor.rb

@@ -1,6 +1,6 @@
 module DeepTest
   class Supervisor
-    def initialize(blackboard)
+    def initialize(blackboard = DeepTest::RindaBlackboard.new)
       @blackboard = blackboard
       @count = 0
     end

data/lib/deep_test/worker.rb

@@ -1,6 +1,6 @@
 module DeepTest
   class Worker
-    def initialize(blackboard)
+    def initialize(blackboard = DeepTest::RindaBlackboard.new)
       @blackboard = blackboard
     end
 

data/script/run_test_suite.rb

@@ -11,27 +11,24 @@ begin
   warlock.start "server" do
     DeepTest::Server.start
   end
-  sleep 0.25          
+  sleep 0.25 # TODO: is this necessary?
 
   # workers
   number_of_workers.to_i.times do |i|
     warlock.start "worker #{i}" do
       srand # re-seed random numbers
       ActiveRecord::Base.connection.reconnect! if defined?(ActiveRecord::Base)
-      blackboard = DeepTest::RindaBlackboard.new
-      DeepTest::Worker.new(blackboard).run
+      DeepTest::Worker.new.run
     end
   end
 
-  passed = false
   loader_pid = fork do
     puts "Loader (#{$$})"
     passed = DeepTest::Loader.run
     exit(passed ? 0 : 1)
   end
   Process.wait(loader_pid)
-  passed = $?.success?
-  passed
+  exit($?.success? ? 0 : 1)
 ensure
   warlock.stop_all if warlock
 end

data/test/failing.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + "/test_helper"
+
+unit_tests do
+  test "failing" do
+    assert false
+  end
+end

data/test/supervised_test_suite_test.rb

@@ -54,4 +54,10 @@ unit_tests do
     
     assert_equal suite.size, supervised_suite.size
   end
+  
+  test "defaults to using DeepTest::Supervisor" do
+    DeepTest::Supervisor.stubs(:new).returns(:supervisor)
+    supervised_suite = DeepTest::SupervisedTestSuite.new(stub)
+    assert_equal :supervisor, supervised_suite.instance_variable_get("@supervisor")
+  end
 end

data/test/supervisor_test.rb

@@ -71,4 +71,10 @@ unit_tests do
      supervisor.read_results Test::Unit::TestResult.new do |channel,name|
      end
   end
+  
+  test "defaults to using a rinda blackboard" do
+    DeepTest::RindaBlackboard.stubs(:new).returns(:rinda_blackboard)
+    supervisor = DeepTest::Supervisor.new
+    assert_equal :rinda_blackboard, supervisor.instance_variable_get("@blackboard")
+  end
 end

data/test/worker_test.rb

@@ -55,4 +55,10 @@ unit_tests do
   test "does not fork from rake" do
     assert !defined?(Rake)
   end
+  
+  test "defaults to using a rinda blackboard" do
+    DeepTest::RindaBlackboard.stubs(:new).returns(:rinda_blackboard)
+    worker = DeepTest::Worker.new
+    assert_equal :rinda_blackboard, worker.instance_variable_get("@blackboard")
+  end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: deep_test
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 date: 2008-02-09 00:00:00 -05:00
 summary: DeepTest runs tests in multiple processes.
 require_paths: 
@@ -45,6 +45,7 @@ files:
 - lib/deep_test/extensions/object_extension.rb
 - lib/deep_test/extensions/testresult.rb
 - script/run_test_suite.rb
+- test/failing.rb
 - test/simple_test_blackboard_test.rb
 - test/supervised_test_suite_test.rb
 - test/supervisor_test.rb