deep_test 1.0.4 → 1.1.0

data/CHANGELOG

@@ -0,0 +1,4 @@
+* 1.1.0
+
+* DeepTest::TestTask#processes= is now DeepTest::TestTask#number_of_workers=
+* No longer depend on the Daemons gem, use DeepTest::Warlock instead.

data/README

@@ -1,10 +1,6 @@
 = DeepTest
 
-DeepTest enables tests to run in multiple processes.
-
-== Authors
-
-anonymous z, Dan[http://www.dcmanges.com/blog] Manges[http://www.dcmanges.com/blog], David Vollbracht
+DeepTest enables tests to run in parallel using multiple processes.
 
 == Usage
 
@@ -14,10 +10,18 @@ In your Rakefile:
   require "deep_test/rake_tasks"
   
   # sample DeepTest task
+
   DeepTest::TestTask.new "task_name" do |t|
+    t.number_of_workers = 2 # optional, defaults to 2
     t.pattern = "test/**/*_test.rb"
-    t.processes = 2 # optional, defaults to 2
   end
 
+== Contributors
+
++* anonymous z
++* Alex Chaffee
++* Dan[http://www.dcmanges.com/blog] Manges[http://www.dcmanges.com/blog]
++* David Vollbracht
+
 == License
 Released under Ruby's[http://www.ruby-lang.org/en/LICENSE.txt] license[http://www.ruby-lang.org/en/LICENSE.txt]

data/Rakefile

@@ -14,8 +14,8 @@ Rake::TestTask.new do |t|
 end
 
 DeepTest::TestTask.new :deep_test do |t|
+  t.number_of_workers = 2
   t.pattern = "test/**/*_test.rb"
-  t.processes = 2
 end
 
 desc "Generate documentation"
@@ -34,22 +34,22 @@ end
 Gem::manage_gems
 
 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.0.4"
+	s.version = "1.1.0"
 	s.author = "anonymous z, Dan Manges, David Vollbracht"
 	s.description = s.summary
 	s.email = "daniel.manges@gmail.com"
   s.homepage = "http://deep-test.rubyforge.org"
   s.rubyforge_project = "deep-test"
-  s.add_dependency "daemons", ">= 1.0.7"
 
   s.has_rdoc = true
-  s.extra_rdoc_files = ['README']
+  s.extra_rdoc_files = ['README', 'CHANGELOG']
   s.rdoc_options << '--title' << "DeepTest" << '--main' << 'README' << '--line-numbers'
 
   s.autorequire = "deep_test"
-  s.files = FileList['{lib,test}/**/*.{rb,rake}', 'README', 'Rakefile'].to_a
+  s.files = FileList['{lib,test}/**/*.{rb,rake}', 'README', 'CHANGELOG', 'Rakefile'].to_a
 end
 
 Rake::GemPackageTask.new(specification) do |package|
@@ -59,3 +59,7 @@ end
 
 Rake::Task[:gem].prerequisites.unshift :deep_test
 Rake::Task[:gem].prerequisites.unshift :test
+
+task :tar do
+  system "tar zcf pkg/deep_test.tar.gz --exclude=.svn --exclude='*.tar.gz' --exclude='*.gem' --directory=.. deep_test"
+end

data/lib/deep_test/extensions/object_extension.rb

@@ -6,7 +6,26 @@ module DeepTest
       yield
       $stdout.string
     ensure
-      $stdout = old_stdout
+      $stdout = old_stdout if old_stdout
+    end
+    
+    def retrying(description = nil, times = 5)
+      i = 0
+      loop do
+        begin
+          return yield
+        rescue => e
+          i += 1
+          print "#{description} received exception #{e}. "
+          if i < times
+            puts "Retrying..."
+            sleep 0.5
+          else
+            puts "Aborting."
+            raise e
+          end
+        end
+      end
     end
   end
 end

data/lib/deep_test/rake_tasks.rb

@@ -1,2 +1 @@
 require File.dirname(__FILE__) + "/test_task"
-Dir.glob(File.dirname(__FILE__) + "/tasks/**/*.rake").each { |file| load file }

data/lib/deep_test/server.rb

@@ -16,7 +16,3 @@ module DeepTest
     end
   end
 end
-
-if __FILE__ == $0
-  DeepTest::Server.start
-end

data/lib/deep_test/test_task.rb

@@ -1,6 +1,7 @@
 module DeepTest
   class TestTask
-    attr_writer :pattern, :processes
+    DEFAULT_NUMBER_OF_WORKERS = 2
+    attr_writer :number_of_workers, :pattern
 
     def initialize(name = :deep_test)
       @name = name
@@ -10,30 +11,46 @@ module DeepTest
     
     def define
       desc "Run '#{@name}' suite using DeepTest"
-      task @name => %w[deep_test:server:start] do
+      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
-          starter = File.expand_path(File.dirname(__FILE__) + "/start_workers.rb")
-          ruby "-I#{deep_test_lib} #{starter} '#{processes}' '#{pattern}'"
+          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
-          Rake::Task["deep_test:workers:stop"].invoke
-          Rake::Task["deep_test:server:stop"].invoke
+          warlock.stop_all if warlock
         end
       end
     end
     
+    def number_of_workers
+      @number_of_workers ? @number_of_workers.to_i : DEFAULT_NUMBER_OF_WORKERS
+    end
+
     def pattern
       Dir.pwd + "/" + (@pattern || "test/**/*_test.rb")
     end
-    
-    def processes
-      @processes ? @processes.to_i : 2
-    end
   end
 end

data/lib/deep_test/tuple_space_factory.rb

@@ -8,4 +8,4 @@ module DeepTest
       Rinda::TupleSpaceProxy.new ts      
     end
   end
-end    
+end

data/lib/deep_test/warlock.rb

@@ -0,0 +1,59 @@
+module DeepTest
+  class Warlock
+    def initialize
+      @demons = []
+    end
+    
+    def start(name, &block)
+      begin
+        pid = Process.fork do
+          Signal.trap("HUP") { exit 0 }
+          yield
+          exit
+        end
+        raise "fatal: fork returned nil" if pid.nil?
+        @demons << [name, pid]
+        puts "Started #{name} (#{pid})"
+      rescue => e
+        puts "exception starting #{name}: #{e}"
+        puts "\t" + e.backtrace.join("\n\t")
+      end
+    end
+
+    def stop_all
+      @demons.reverse.each do |demon|
+        name, pid = demon
+        if running?(pid)
+          Process.kill("HUP", pid)
+        end
+      end
+      @demons.each do |demon|
+        name, pid = demon
+        begin
+          Process.wait(pid)
+        rescue Errno::ECHILD => e
+          puts e
+        end
+        puts "Stopped #{name} (#{pid})"
+      end
+    end
+
+    #stolen from daemons
+    def running?(pid)
+      # Check if process is in existence
+      # The simplest way to do this is to send signal '0'
+      # (which is a single system call) that doesn't actually
+      # send a signal
+      begin
+        Process.kill(0, pid)
+        return true
+      rescue Errno::ESRCH
+        return false
+      rescue ::Exception   # for example on EPERM (process exists but does not belong to us)
+        return true
+      #rescue Errno::EPERM
+      #  return false
+      end
+    end    
+  end
+end

data/lib/deep_test.rb

@@ -1,8 +1,11 @@
 module DeepTest
 end
+require 'rinda/ring'
+require 'rinda/tuplespace'
 
 require "test/unit/testresult"
 require "test/unit/error"
+require 'test/unit/failure'
 
 require "deep_test/extensions/testresult"
 require "deep_test/extensions/error"
@@ -16,3 +19,4 @@ require "deep_test/supervised_test_suite"
 require "deep_test/supervisor"
 require "deep_test/test_task"
 require "deep_test/worker"
+require "deep_test/warlock"

data/test/deep_test/extensions/object_extension_test.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + "/../../test_helper"
+
+unit_tests do
+  test "retrying once" do
+    object = Object.new
+    object.expects(:call_it_twice).times(2).raises(RuntimeError).then.returns(:ok)
+    result = nil
+    capture_stdout do
+      result = retrying do
+        object.call_it_twice
+      end
+    end
+    assert_equal :ok, result
+  end
+  
+  test "retrying defaults to 5 times" do
+    object = Object.new
+    object.expects(:may_i_please_have_another).times(5).
+      raises(RuntimeError).raises(RuntimeError).raises(RuntimeError).raises(RuntimeError).returns("ok")
+    capture_stdout do
+      retrying do
+        object.may_i_please_have_another
+      end
+    end
+  end
+  
+  test "retrying raises exception if still failing after number of attempts" do
+    my_error = Class.new(StandardError)
+    assert_raises(my_error) do
+      capture_stdout do
+        retrying "", 1 do
+          raise my_error
+        end
+      end
+    end
+  end
+end

data/test/deep_test/warlock_test.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+unit_tests do
+  test "running? is true if sending kill(0, pid) does not fail" do
+    warlock = DeepTest::Warlock.new
+    Process.expects(:kill).with(0, :pid)
+    assert_equal true, warlock.running?(:pid)
+  end
+  
+  test "running? is false if Process.kill(0, pid) raises Errno::ESRCH" do
+    warlock = DeepTest::Warlock.new
+    Process.stubs(:kill).raises(Errno::ESRCH)
+    assert_equal false, warlock.running?(:pid)
+  end
+  
+  test "running? is true if Process.kill raises Exception" do
+    warlock = DeepTest::Warlock.new
+    Process.stubs(:kill).raises(Exception)
+    assert_equal true, warlock.running?(:pid)
+  end
+end

data/test/test_helper.rb

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

data/test/test_task_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/test_helper"
 unit_tests do
   test "defines a rake task with the name passed to the constructor" do
     DeepTest::TestTask.any_instance.stubs(:desc)
-    DeepTest::TestTask.any_instance.expects(:task).with { |hash| hash.keys == [:my_task_name] }
+    DeepTest::TestTask.any_instance.expects(:task).with(:my_task_name)
     DeepTest::TestTask.new :my_task_name do
     end
   end
@@ -24,18 +24,18 @@ unit_tests do
     assert_equal "test/**/*_test.rb", task.pattern[-"test/**/*_test.rb".size..-1]
   end
   
-  test "processes defaults to 2" do
+  test "number_of_workers defaults to 2" do
     task = DeepTest::TestTask.new do |t|
       t.stubs(:define)
     end
-    assert_equal 2, task.processes
+    assert_equal 2, task.number_of_workers
   end
   
-  test "processes can be set" do
+  test "number_of_workers can be set" do
     task = DeepTest::TestTask.new do |t|
-      t.processes = 42
+      t.number_of_workers = 42
       t.stubs(:define)
     end
-    assert_equal 42, task.processes
+    assert_equal 42, task.number_of_workers
   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.0.4
-date: 2007-12-08 00:00:00 -06:00
+  version: 1.1.0
+date: 2007-12-23 00:00:00 -05:00
 summary: DeepTest runs tests in multiple processes.
 require_paths: 
 - lib
@@ -35,16 +35,15 @@ files:
 - lib/deep_test/rinda_blackboard.rb
 - lib/deep_test/server.rb
 - lib/deep_test/simple_test_blackboard.rb
-- lib/deep_test/start_workers.rb
 - lib/deep_test/supervised_test_suite.rb
 - lib/deep_test/supervisor.rb
 - lib/deep_test/test_task.rb
 - lib/deep_test/tuple_space_factory.rb
+- lib/deep_test/warlock.rb
 - lib/deep_test/worker.rb
 - lib/deep_test/extensions/error.rb
 - lib/deep_test/extensions/object_extension.rb
 - lib/deep_test/extensions/testresult.rb
-- lib/deep_test/tasks/rinda.rake
 - test/simple_test_blackboard_test.rb
 - test/supervised_test_suite_test.rb
 - test/supervisor_test.rb
@@ -54,8 +53,10 @@ files:
 - test/worker_test.rb
 - test/deep_test/loader_test.rb
 - test/deep_test/rinda_blackboard_test.rb
-- test/deep_test/start_workers_test.rb
+- test/deep_test/warlock_test.rb
+- test/deep_test/extensions/object_extension_test.rb
 - README
+- CHANGELOG
 - Rakefile
 test_files: []
 
@@ -67,19 +68,12 @@ rdoc_options:
 - --line-numbers
 extra_rdoc_files: 
 - README
+- CHANGELOG
 executables: []
 
 extensions: []
 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: daemons
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.7
-    version: 
+dependencies: []
+

data/lib/deep_test/start_workers.rb

@@ -1,23 +0,0 @@
-module DeepTest
-  module StartWorkers
-    def self.run(args)
-      processes, pattern = args
-      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"
-          Object.const_set "RAILS_ENV", "test"
-          Dir.glob(pattern).each { |file| load file }
-          blackboard = DeepTest::RindaBlackboard.new
-          DeepTest::Worker.new(blackboard).run
-        end
-      end
-    end
-  end
-end
-
-if __FILE__ == $0
-  require "rubygems"
-  require "daemons"
-  DeepTest::StartWorkers.run ARGV
-end

data/lib/deep_test/tasks/rinda.rake

@@ -1,33 +0,0 @@
-require "rubygems"
-begin
-  require "daemons"
-rescue LoadError
-  raise "The daemons gem must be installed to use deep_test"
-end
-
-namespace :deep_test do
-  namespace :server do
-    task :start do
-      Daemons.run_proc "deep_test_server", :ARGV => ["start"], :backtrace => true, :log_output => true do
-        require "deep_test"
-        ENV["RAILS_ENV"] = "test"
-        Object.const_set "RAILS_ENV", "test"
-        DeepTest::Server.start
-      end
-      sleep 0.25
-    end
-    task :stop do
-      Daemons.run("deep_test_server", :ARGV => ["stop"])
-    end
-  end
-  
-  namespace :workers do
-    task :start do
-      raise "deprecated -dan"
-    end
-    
-    task :stop do
-      Daemons.run("deep_test_worker", :ARGV => ["stop"])
-    end
-  end
-end

data/test/deep_test/start_workers_test.rb

@@ -1,9 +0,0 @@
-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