deep_test 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+* 1.1.1 (February 9, 2008)
+
+* No longer fork from Rake process.
+
 * 1.1.0
 
 * DeepTest::TestTask#processes= is now DeepTest::TestTask#number_of_workers=

data/Rakefile

@@ -37,7 +37,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.0"
+	s.version = "1.1.1"
 	s.author = "anonymous z, Dan Manges, David Vollbracht"
 	s.description = s.summary
 	s.email = "daniel.manges@gmail.com"
@@ -49,7 +49,7 @@ specification = Gem::Specification.new do |s|
   s.rdoc_options << '--title' << "DeepTest" << '--main' << 'README' << '--line-numbers'
 
   s.autorequire = "deep_test"
-  s.files = FileList['{lib,test}/**/*.{rb,rake}', 'README', 'CHANGELOG', 'Rakefile'].to_a
+  s.files = FileList['{lib,script,test}/**/*.{rb,rake}', 'README', 'CHANGELOG', 'Rakefile'].to_a
 end
 
 Rake::GemPackageTask.new(specification) do |package|

data/lib/deep_test/loader.rb

@@ -5,11 +5,8 @@ module DeepTest
       self
     end
     
-    def self.run(args)
+    def self.run
       require "deep_test"
-      ENV["RAILS_ENV"] = "test"
-      Object.const_set "RAILS_ENV", "test"
-      Dir.glob(ARGV.first).each { |file| load file }
       suite = Test::Unit::AutoRunner::COLLECTORS[:objectspace].call NO_FILTERS
       blackboard = DeepTest::RindaBlackboard.new
       supervisor = DeepTest::Supervisor.new blackboard
@@ -21,7 +18,3 @@ module DeepTest
     end 
   end
 end
-
-if __FILE__ == $0
-  exit DeepTest::Loader.run(ARGV)
-end

data/lib/deep_test/test_task.rb

@@ -12,36 +12,9 @@ module DeepTest
     def define
       desc "Run '#{@name}' suite using DeepTest"
       task @name do
-        begin
-          deep_test_lib = File.expand_path(File.dirname(__FILE__) + "/..")
-          $LOAD_PATH << deep_test_lib
-          require "deep_test"
-          warlock = DeepTest::Warlock.new
-          
-          # server
-          warlock.start "server" do
-            DeepTest::Server.start
-          end
-          sleep 0.25          
-
-          # workers
-          number_of_workers.times do |i|
-            warlock.start "worker #{i}" do
-              srand # re-seed random numbers
-              ENV["RAILS_ENV"] = "test"
-              Object.const_set "RAILS_ENV", "test"
-              Dir.glob(pattern).each { |file| load file }
-              blackboard = DeepTest::RindaBlackboard.new
-              DeepTest::Worker.new(blackboard).run
-            end
-          end
-
-          # loader
-          loader = File.expand_path(File.dirname(__FILE__) + "/loader.rb")
-          ruby "-I#{deep_test_lib} #{loader} '#{pattern}'"
-        ensure
-          warlock.stop_all if warlock
-        end
+        deep_test_lib = File.expand_path(File.dirname(__FILE__) + "/..")
+        runner = File.expand_path(File.dirname(__FILE__) + "/../../script/run_test_suite.rb")
+        ruby "-I#{deep_test_lib} #{runner} '#{number_of_workers}' '#{pattern}'"
       end
     end
     

data/lib/deep_test.rb

@@ -13,6 +13,7 @@ require "deep_test/extensions/object_extension"
 
 require "deep_test/tuple_space_factory"
 require "deep_test/rinda_blackboard"
+require "deep_test/loader"
 require "deep_test/server"
 require "deep_test/simple_test_blackboard"
 require "deep_test/supervised_test_suite"

data/script/run_test_suite.rb

@@ -0,0 +1,37 @@
+number_of_workers, pattern = ARGV
+begin
+  require "deep_test"
+  warlock = DeepTest::Warlock.new
+  Signal.trap("HUP") { warlock.stop_all; exit 0 }
+  
+  Dir.glob(pattern).each { |file| load file }
+  Test::Unit.run = true
+  
+  # server
+  warlock.start "server" do
+    DeepTest::Server.start
+  end
+  sleep 0.25          
+
+  # 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
+    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
+ensure
+  warlock.stop_all if warlock
+end

data/test/worker_test.rb

@@ -51,4 +51,8 @@ unit_tests do
     assert_equal 0, result.failure_count
     assert_equal 0, result.assertion_count
   end
+  
+  test "does not fork from rake" do
+    assert !defined?(Rake)
+  end
 end

metadata

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