deep_test 1.1.3 → 1.1.4

data/CHANGELOG

@@ -1,3 +1,11 @@
+* 1.1.4 (March 11, 2008)
+
+* Fixed 2 RSpec pending example bugs
+* Fixed setting spec_opts with DeepTest bug
+* Raise an error if before or after all is defined
+* Added server_port to configuration options
+* Wait for signal from server indicating it is ready on startup
+
 * 1.1.3 (March 10, 2008)
 
 * Added Support for RSpec

data/README

@@ -14,15 +14,17 @@ In your Rakefile:
   DeepTest::TestTask.new "task_name" do |t|
     t.number_of_workers = 2   # optional, defaults to 2
     t.timeout_in_seconds = 30 # optional, defaults to 30
+    t.server_port = 6969      # optional, defaults to 6969
     t.pattern = "test/**/*_test.rb"
   end
 
-  # Sample SpecTask using DeepTest
+  # sample SpecTask using DeepTest
 
   Spec::Rake::SpecTask.new(:deep_spec) do |t|
     t.spec_files = FileList['spec/**/*_spec.rb']
     t.deep_test :number_of_workers => 2,   # optional, defaults to 2
                 :timeout_in_seconds => 30, # optional, defaults to 30
+                :server_port => 6969       # optional, defaults to 6969
   end
 
 
@@ -54,11 +56,11 @@ loaded, so it is available to be instantiated.
 
 == Contributors
 
-+* anonymous z
-+* Alex Chaffee
-+* Dan[http://www.dcmanges.com/blog] Manges[http://www.dcmanges.com/blog]
-+* David Vollbracht[http://davidvollbracht.com/]
-+* Scott Taylor
+* anonymous z
+* Alex Chaffee
+* Dan[http://www.dcmanges.com/blog] Manges[http://www.dcmanges.com/blog]
+* David[http://davidvollbracht.com/] Vollbracht[http://davidvollbracht.com/]
+* Scott Taylor
 
 == License
 Released under Ruby's[http://www.ruby-lang.org/en/LICENSE.txt] license[http://www.ruby-lang.org/en/LICENSE.txt]

data/Rakefile

@@ -58,7 +58,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.3"
+	s.version = "1.1.4"
 	s.author = "anonymous z, Dan Manges, David Vollbracht"
 	s.description = s.summary
 	s.email = "daniel.manges@gmail.com"

data/lib/deep_test/options.rb

@@ -22,6 +22,7 @@ module DeepTest
         Option.new(:number_of_workers, :to_i, 2),
         Option.new(:pattern, :to_s, nil),
         Option.new(:timeout_in_seconds, :to_i, 30),
+        Option.new(:server_port, :to_i, 6969),
         Option.new(:worker_listener, :to_s, "DeepTest::NullWorkerListener"),
       ]
     end

data/lib/deep_test/process_orchestrator.rb

@@ -56,8 +56,19 @@ module DeepTest
     end
 
     def start_warlock_server
-      @warlock.start("server") { DeepTest::Server.start }
-      sleep 0.5 # TODO: change from sleep to something better... Process.wait?
+      server_ready = false
+      previous_trap = Signal.trap('USR2') {server_ready = true}
+
+      pid = Process.pid
+      @warlock.start("server") do
+        DeepTest::Server.start(@options) do
+          Process.kill('USR2', pid)
+        end
+      end
+
+      Thread.pass until server_ready
+    ensure
+      Signal.trap('USR2', previous_trap)
     end
 
     def stop_all_warlocks

data/lib/deep_test/rinda_blackboard.rb

@@ -1,6 +1,6 @@
 module DeepTest
   class RindaBlackboard
-    def initialize(options, tuple_space = TupleSpaceFactory.tuple_space)
+    def initialize(options, tuple_space = TupleSpaceFactory.tuple_space(options))
       @options = options
       @tuple_space = tuple_space
     end

data/lib/deep_test/server.rb

@@ -1,11 +1,10 @@
 module DeepTest
   class Server
-    PORT = 6969 unless defined?(PORT)
-    
-    def self.start
+    def self.start(options)
       DRb.start_service
-      Rinda::RingServer.new(Rinda::TupleSpace.new, PORT)
+      Rinda::RingServer.new(Rinda::TupleSpace.new, options.server_port)
       DeepTest.logger.info "Started DeepTest service at #{DRb.uri}"
+      yield if block_given?
       DRb.thread.join
     end
   end

data/lib/deep_test/spec.rb

@@ -1,6 +1,8 @@
 require 'spec/runner/example_group_runner'
+require 'spec/example/example_group_methods'
 require 'spec/rake/spectask'
 
+require File.dirname(__FILE__) + "/spec/extensions/example_group_methods"
 require File.dirname(__FILE__) + "/spec/extensions/spec_task"
 require File.dirname(__FILE__) + "/spec/extensions/options"
 require File.dirname(__FILE__) + "/spec/extensions/reporter"

data/lib/deep_test/spec/extensions/example_group_methods.rb

@@ -0,0 +1,38 @@
+module Spec
+  module Example
+    module ExampleGroupMethods
+      PREPEND_BEFORE = instance_method(:prepend_before) unless defined?(PREPEND_BEFORE)
+      APPEND_BEFORE = instance_method(:append_before) unless defined?(APPEND_BEFORE)
+      PREPEND_AFTER = instance_method(:prepend_after) unless defined?(PREPEND_AFTER)
+      APPEND_AFTER = instance_method(:append_after) unless defined?(APPEND_AFTER)
+
+      def prepend_before(*args, &block)
+        check_filter_args(args)
+        PREPEND_BEFORE.bind(self).call(*args, &block)
+      end
+
+      def append_before(*args, &block)
+        check_filter_args(args)
+        APPEND_BEFORE.bind(self).call(*args, &block)
+      end
+      alias_method :before, :append_before
+
+      def prepend_after(*args, &block)
+        check_filter_args(args)
+        PREPEND_AFTER.bind(self).call(*args, &block)
+      end
+
+      def append_after(*args, &block)
+        check_filter_args(args)
+        APPEND_AFTER.bind(self).call(*args, &block)
+      end
+      alias_method :after, :append_after
+
+      def check_filter_args(args)
+        raise BeforeAfterAllNotSupportedByDeepTestError if args.first == :all
+      end
+
+      class BeforeAfterAllNotSupportedByDeepTestError < StandardError; end
+    end
+  end
+end

data/lib/deep_test/spec/extensions/reporter.rb

@@ -2,6 +2,18 @@ require 'spec/runner/reporter'
 module Spec
   module Runner
     class Reporter
+      def example_finished(example, error=nil)
+        @examples << example
+        
+        if error.nil?
+          example_passed(example)
+        elsif Spec::Example::ExamplePendingError === error
+          example_pending(example.class, example, error.message)
+        else
+          example_failed(example, error)
+        end
+      end
+
       def failure(example, error)
         backtrace_tweaker.tweak_backtrace(error)
         example_name = "#{example.class.description} #{example.description}"

data/lib/deep_test/spec/extensions/spec_task.rb

@@ -5,8 +5,15 @@ module Spec
         deep_test_options = DeepTest::Options.new(options)
         deep_test_path = File.expand_path(File.dirname(__FILE__) + 
                                           "/../../../deep_test")
-        spec_opts << "--require #{deep_test_path}"
-        spec_opts << "--runner 'DeepTest::Spec::Runner:#{deep_test_options.to_command_line}'"
+        @deep_test_spec_opts = [
+          "--require #{deep_test_path}",
+          "--runner 'DeepTest::Spec::Runner:#{deep_test_options.to_command_line}'"
+        ]
+        spec_opts.concat @deep_test_spec_opts
+      end
+
+      def spec_opts=(options)
+        @spec_opts = (@deep_test_spec_opts || []) + options
       end
     end
   end

data/lib/deep_test/spec/runner.rb

@@ -36,7 +36,7 @@ module DeepTest
           print result.output if result.output
           example = examples_by_location.delete("#{result.file}:#{result.line}")
           @options.reporter.example_finished(example, result.error)
-          success &= result.error.nil?
+          success &= result.success?
         end
 
         success

data/lib/deep_test/spec/work_result.rb

@@ -18,6 +18,10 @@ module DeepTest
         DeadlockDetector.due_to_deadlock?(@error)
       end
 
+      def success?
+        error.nil? || ::Spec::Example::ExamplePendingError === error
+      end
+
       def deadlock_result
         WorkResult.new(file, line, example_description, nil, '-deadlock-')
       end

data/lib/deep_test/test_task.rb

@@ -31,6 +31,14 @@ module DeepTest
       @options.pattern = Dir.pwd + "/" + pattern
     end
 
+    def server_port=(port)
+      @options.server_port = port
+    end
+
+    def server_port
+      @options.server_port
+    end
+
     def timeout_in_seconds=(seconds)
       @options.timeout_in_seconds = seconds
     end

data/lib/deep_test/tuple_space_factory.rb

@@ -1,10 +1,10 @@
 module DeepTest
   class TupleSpaceFactory
-    def self.tuple_space
+    def self.tuple_space(options)
       require "rinda/ring"
       require "socket"
       DRb.start_service
-      ts = Rinda::RingFinger.new([Socket.gethostname],DeepTest::Server::PORT).lookup_ring_any
+      ts = Rinda::RingFinger.new([Socket.gethostname],options.server_port).lookup_ring_any
       DeepTest.logger.debug "Connected to DeepTest server at #{ts.__drburi}"
       Rinda::TupleSpaceProxy.new ts      
     end

data/test/deep_test/test_task_test.rb

@@ -20,4 +20,14 @@ unit_tests do
     assert_equal "A", t.instance_variable_get(:@options).worker_listener
     assert_equal "A", t.worker_listener
   end
+
+  test "should support server_port" do
+    t = DeepTest::TestTask.new :deep_test do |t|
+      t.stubs(:desc)
+      t.stubs(:task)
+      t.server_port = 10
+    end
+    assert_equal 10, t.instance_variable_get(:@options).server_port
+    assert_equal 10, t.server_port
+  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.3
-date: 2008-03-10 00:00:00 -04:00
+  version: 1.1.4
+date: 2008-03-11 00:00:00 -04:00
 summary: DeepTest runs tests in multiple processes.
 require_paths: 
 - lib
@@ -49,6 +49,7 @@ files:
 - lib/deep_test/spec/runner.rb
 - lib/deep_test/spec/work_result.rb
 - lib/deep_test/spec/work_unit.rb
+- lib/deep_test/spec/extensions/example_group_methods.rb
 - lib/deep_test/spec/extensions/options.rb
 - lib/deep_test/spec/extensions/reporter.rb
 - lib/deep_test/spec/extensions/spec_task.rb