deep_test 1.0.0 → 1.0.1

data/Rakefile

@@ -36,7 +36,7 @@ Gem::manage_gems
 specification = Gem::Specification.new do |s|
 	s.name   = "deep_test"
   s.summary = "DeepTest runs tests in multiple processes."
-	s.version = "1.0.0"
+	s.version = "1.0.1"
 	s.author = "anonymous z, Dan Manges, David Vollbracht"
 	s.description = s.summary
 	s.email = "daniel.manges@gmail.com"

data/lib/deep_test/loader.rb

@@ -15,12 +15,13 @@ module DeepTest
       supervisor = DeepTest::Supervisor.new blackboard
       supervised_suite = DeepTest::SupervisedTestSuite.new(suite, supervisor)
       require 'test/unit/ui/console/testrunner'
-      Test::Unit::UI::Console::TestRunner.run(supervised_suite, Test::Unit::UI::NORMAL)
+      result = Test::Unit::UI::Console::TestRunner.run(supervised_suite, Test::Unit::UI::NORMAL)
       Test::Unit.run = true
-    end
+      return result.passed?
+    end 
   end
 end
 
 if __FILE__ == $0
-  DeepTest::Loader.run ARGV
+  exit DeepTest::Loader.run(ARGV)
 end

data/lib/deep_test/rinda_blackboard.rb

@@ -1,20 +1,16 @@
 module DeepTest
   class RindaBlackboard
-    def initialize
-      require "rinda/ring"
-      DRb.start_service
-      ring_server = Rinda::RingFinger.primary
-      ts = ring_server.read([:name, :TupleSpace, nil, nil])[2]
-      @tuple_space = Rinda::TupleSpaceProxy.new ts
+    def initialize(tuple_space = TupleSpaceFactory.tuple_space)
+      @tuple_space = tuple_space
     end
-
+    
     def take_result
-      result = @tuple_space.take ["test_result", nil], 3
+      result = @tuple_space.take ["test_result", nil], 30
       result[1]
     end
 
     def take_test
-      tuple = @tuple_space.take(["run_test", nil, nil])
+      tuple = @tuple_space.take ["run_test", nil, nil], 30
       eval(tuple[1]).new(tuple[2])
     end
 
@@ -25,5 +21,15 @@ module DeepTest
     def write_test(test_case)
       @tuple_space.write ["run_test", test_case.class.to_s, test_case.method_name]
     end
+    
+    class TupleSpaceFactory
+      def self.tuple_space
+        require "rinda/ring"
+        DRb.start_service
+        ring_server = Rinda::RingFinger.primary
+        ts = ring_server.read([:name, :TupleSpace, nil, nil])[2]
+        Rinda::TupleSpaceProxy.new ts      
+      end
+    end
   end
 end

data/lib/deep_test/start_workers.rb

@@ -2,7 +2,7 @@ module DeepTest
   module StartWorkers
     def self.run(args)
       processes, pattern = args
-      1.to_i.times do
+      processes.to_i.times do
         Daemons.run_proc "deep_test_worker", :multiple => true, :ARGV => ["start"], :backtrace => true, :log_output => true do
           require "deep_test"
           ENV["RAILS_ENV"] = "test"

data/lib/deep_test.rb

@@ -8,7 +8,6 @@ require "deep_test/extensions/testresult"
 require "deep_test/extensions/error"
 require "deep_test/extensions/object_extension"
 
-# require "deep_test/loader"
 require "deep_test/rinda_blackboard"
 require "deep_test/server"
 require "deep_test/simple_test_blackboard"

data/test/deep_test/loader_test.rb

@@ -1,7 +1,8 @@
-# require File.dirname(__FILE__) + "/../test_helper"
-# 
-# unit_tests do
-#   test "no filters constant has empty filters" do
-#     assert_equal [], DeepTest::Loader::NO_FILTERS.filters
-#   end
-# end
+require File.dirname(__FILE__) + "/../test_helper"
+require "deep_test/loader" unless defined?(DeepTest::Loader)
+
+unit_tests do
+  test "no filters constant has empty filters" do
+    assert_equal [], DeepTest::Loader::NO_FILTERS.filters
+  end
+end

data/test/deep_test/rinda_blackboard_test.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+unit_tests do
+  test "take result waits 30 seconds before timing out" do
+    blackboard = DeepTest::RindaBlackboard.new(tuple_space = stub)
+    tuple_space.expects(:take).with(["test_result", nil], 30).returns([])
+    blackboard.take_result
+  end
+
+  test "take test waits 30 seconds before timing out" do
+    blackboard = DeepTest::RindaBlackboard.new(tuple_space = stub)
+    tuple_space.expects(:take).with(["run_test", nil, nil], 30).returns([nil, "String", "foo"])
+    blackboard.take_test
+  end
+end

data/test/deep_test/start_workers_test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require "deep_test/start_workers"
+
+unit_tests do
+  test "can specify number of processes to start" do
+    Daemons.expects(:run_proc).times(3)
+    DeepTest::StartWorkers.run [3, "pattern"]
+  end
+end

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'test/unit'
 require 'dust'
 require 'mocha'
+require 'daemons'
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/lib")
 require "deep_test"
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: deep_test
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-09-04 00:00:00 -04:00
+  version: 1.0.1
+date: 2007-09-06 00:00:00 -04:00
 summary: DeepTest runs tests in multiple processes.
 require_paths: 
 - lib
@@ -52,6 +52,8 @@ files:
 - test/testresult_test.rb
 - test/worker_test.rb
 - test/deep_test/loader_test.rb
+- test/deep_test/rinda_blackboard_test.rb
+- test/deep_test/start_workers_test.rb
 - CHANGELOG
 - README
 - Rakefile