dtr 0.0.4 → 1.0.0

data/lib/dtr/shared/working_env.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module DTR
+  class WorkingEnv
+    def initialize
+      files = (defined?($argv_dup) && $argv_dup ? $argv_dup : []).dup
+      @env = {:libs => $LOAD_PATH.dup, :files => files, :created_at => Time.now.to_s, :dtr_master_env => ENV['DTR_MASTER_ENV'], :agent_env_setup_cmd => ENV['DTR_AGENT_ENV_SETUP_CMD'], :identifier => "#{Time.now.to_s}:#{rand}:#{object_id}", :host => Socket.gethostname, :pwd => Dir.pwd}
+    end
+
+    def [](key)
+      @env[key]
+    end
+    
+    def []=(key, value)
+      @env[key] = value
+    end
+    
+    def to_s
+      @env.inspect
+    end
+    
+    def ==(obj)
+      obj && obj[:identifier] == self[:identifier]
+    end
+  end
+end

data/lib/dtr/test_unit.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2008 Li Xiao
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,278 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'dtr/base'
-require 'dtr/service_provider'
-require 'test/unit/testcase'
-require 'test/unit/util/observable'
-require 'monitor'
-require 'drb'
-require 'timeout'
+require 'dtr/master'
 
-DTROPTIONS = {} unless defined?(DTROPTIONS)
-DTROPTIONS[:log_file] = 'dtr_master_process.log' unless DTROPTIONS[:log_file]
-
-module DTR
-  def reject
-    return unless Test::Unit::TestSuite.method_defined?(:dtr_injected?)
-    Test::Unit::TestCase.send(:include, Rejection)
-    Test::Unit::TestSuite.send(:include, Rejection)
-  end
-  
-  def inject
-    return if Test::Unit::TestSuite.method_defined?(:dtr_injected?)
-    Test::Unit::TestCase.send(:include, TestCaseInjection)
-    Test::Unit::TestSuite.send(:include, TestSuiteInjection)
-  end
-  
-  def service_provider
-    $dtr_service_provider ||= DTR::ServiceProvider.new
-  end
-
-  module_function :reject, :inject, :service_provider
-  
-  class Counter
-    
-    def initialize
-      extend MonitorMixin
-      @start_count, @finish_count = 0, 0
-      @complete_cond = new_cond
-    end
-
-    def add_start_count
-      synchronize do
-        @start_count += 1
-      end
-    end
-
-    def add_finish_count
-      synchronize do
-        @finish_count += 1
-        @complete_cond.signal
-      end
-    end
-    
-    def to_s
-      synchronize do
-        status
-      end
-    end
-    
-    def wait_until_complete
-      synchronize do
-        @complete_cond.wait_until {complete?}
-      end
-    end
-    
-    private
-    def complete?
-      DTR.info{ "Counter status: #{status}" }
-      @finish_count >= @start_count
-    end
-    
-    def status
-      "finish_count => #{@finish_count}, start_count => #{@start_count}"
-    end
-  end
-  
-  class ThreadSafeTestResult
-    include Test::Unit::Util::Observable
-    include DRbUndumped
-
-    def initialize(rs)
-      extend MonitorMixin
-      @rs = rs
-      @channels = @rs.send(:channels).dup
-      @rs.send(:channels).clear
-    end
-
-    def add_run
-      synchronize do
-        @rs.add_run
-      end  
-      notify_listeners(Test::Unit::TestResult::CHANGED, self)
-    end
-
-    def add_failure(failure)
-      synchronize do
-        @rs.add_failure(failure)
-      end  
-      notify_listeners(Test::Unit::TestResult::FAULT, failure)
-      notify_listeners(Test::Unit::TestResult::CHANGED, self)
-    end
-
-    def add_error(error)
-      synchronize do
-        @rs.add_error(error)
-      end  
-      notify_listeners(Test::Unit::TestResult::FAULT, error)
-      notify_listeners(Test::Unit::TestResult::CHANGED, self)
-    end
-
-    def add_assertion
-      synchronize do
-        @rs.add_assertion
-      end  
-      notify_listeners(Test::Unit::TestResult::CHANGED, self)
-    end
-
-    def to_s
-      synchronize do
-        @rs.to_s
-      end  
-    end
-
-    def passed?
-      synchronize do
-        @rs.passed?
-      end  
-    end
-
-    def failure_count
-      synchronize do
-        @rs.failure_count
-      end  
-    end
-    
-    def error_count
-      synchronize do
-        @rs.error_count
-      end  
-    end
-  end
-
-  class DRbTestRunner
-    
-    # because some test case will rewrite TestCase#run to ignore some tests, which
-    # makes TestResult#run_count different with TestSuite#size, so we need to count
-    # by ourselves.(for example: ActionController::IntegrationTest)
-    class << self
-      def counter
-        @counter ||= Counter.new
-      end
-    end
-    
-    RUN_TEST_FINISHED = "::DRbTestRunner::RUN_TEST_FINISHED"
-    DEFAULT_RUN_TEST_TIMEOUT = 60 #seconds
-    
-    def initialize(test, result, &progress_block)
-      @test = test
-      @result = result
-      @progress_block = progress_block
-      
-      DRbTestRunner.counter.add_start_count
-    end
-    
-    def run
-      if runner = lookup_runner
-        run_test_on(runner)
-      else
-        self.run
-      end
-    end
-    
-    def run_test_on(runner)
-      Thread.start do
-        begin
-          Timeout.timeout(ENV['RUN_TEST_TIMEOUT'] || DEFAULT_RUN_TEST_TIMEOUT) do
-            runner.run(@test, @result, &@progress_block)
-          end
-          @progress_block.call(RUN_TEST_FINISHED, @test.name)
-        rescue Timeout::Error => e
-          DTR.info {"Run test timeout(#{ENV['RUN_TEST_TIMEOUT'] || DEFAULT_RUN_TEST_TIMEOUT}), reboot runner"}
-          runner.reboot rescue nil
-          DTR.info {"rerun test: #{@test.name}"}
-          self.run
-        rescue DRb::DRbConnError => e
-          DTR.info {"DRb::DRbConnError(#{e.message}), rerun test: #{@test.name}"}
-          self.run
-        rescue Exception => e
-          DTR.info{ "#{test.name}, rescue an exception: #{e.message}, add error into result." }
-          @result.add_error(Test::Unit::Error.new(@test.name, e))
-          @result.add_run
-          @progress_block.call(Test::Unit::TestCase::FINISHED, @test.name)
-          @progress_block.call(RUN_TEST_FINISHED, @test.name)
-        end
-      end
-    end
-    
-    def lookup_runner
-      runner = DTR.service_provider.lookup_runner
-      begin
-        DTR.debug {"#{runner.name}.env ==?: #{WorkingEnv.current[:identifier] == runner.identifier}"}
-        return runner if runner.identifier == WorkingEnv.current[:identifier]
-        runner.shutdown
-      rescue DRb::DRbConnError => e
-        DTR.debug {"DRb::DRbConnError(#{e.message})"}
-      end
-      nil
-    end
-  end
-  
-  module TestCaseInjection
-    
-    def self.included(base)
-      base.class_eval do
-        alias_method :__run__, :run
-
-        def run(result, &progress_block)
-          DTR.debug {"start of run TestCase(#{name})"}
-          DRbTestRunner.new(self, result, &progress_block).run
-          DTR.debug {"end of run TestCase(#{name})"}
-        end
-      end
-    end  
-  end
-
-  module TestSuiteInjection
-    def self.included(base)
-      base.class_eval do
-        def dtr_injected?
-          true
-        end
-
-        alias_method :__run__, :run
-        
-        def run(result, &progress_block)
-          DTR.info { "start of run suite(#{name}), size: #{size};"}
-          
-          if result.kind_of?(ThreadSafeTestResult)
-            __run__(result, &progress_block)
-          else
-            if defined?(ActiveRecord::Base)
-              ActiveRecord::Base.clear_active_connections! rescue nil
-            end
-            
-            DTR.service_provider.setup_working_env WorkingEnv.refresh
-            
-            puts 'Refreshed dtr working environment, looking for runner service...' unless ENV['DTR_ENV'] == 'test'
-            DTR.info {"Master process started at #{Time.now}"}
-            result = ThreadSafeTestResult.new(result)
-            __run__(result) do |channel, value|
-              DTR.debug { "=> channel: #{channel}, value: #{value}" }
-              progress_block.call(channel, value)
-              if channel == DTR::DRbTestRunner::RUN_TEST_FINISHED
-                DRbTestRunner.counter.add_finish_count
-              end
-            end
-            DRbTestRunner.counter.wait_until_complete
-            DTR.debug { "==> teardown" }
-            DTR.service_provider.teardown_working_env
-          end
-          DTR.info { "end of run suite(#{name}), test result status: #{result}, counter status: #{DRbTestRunner.counter}"}
-        end
-      end
-    end
-  end
-  
-  module Rejection
-    def self.included(base)
-      base.class_eval do
-        remove_method :dtr_injected? if base.method_defined?(:dtr_injected?)
-        remove_method :run
-        alias_method :run, :__run__
-        remove_method :__run__
-      end
-    end
-  end
-end
+require 'dtr/test_unit/worker_club'
+require 'dtr/test_unit/thread_safe_test_result'
+require 'dtr/test_unit/drb_test_runner'
+require 'dtr/test_unit/test_case_injection'
+require 'dtr/test_unit/test_suite_injection'
+require 'dtr/test_unit/testrunnermediator_injection'
+require 'dtr/test_unit/injection'

data/lib/dtr/test_unit/drb_test_runner.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module DTR
+  module TestUnit
+    class DRbTestRunner
+      include Service::Runner
+
+      def initialize(test, result, &progress_block)
+        @test = test
+        @result = result
+        @progress_block = progress_block
+      end
+
+      def run
+        if runner = lookup_runner
+          WorkerClub.instance.start_thread(self, runner)
+        else
+          self.run
+        end
+      end
+
+      def run_test_on(runner)
+        runner.run(@test, @result, &@progress_block)
+      rescue DRb::DRbConnError => e
+        DTR.info {"#{cause.class.name}(#{cause.message}), rerun test: #{@test.name}"}
+        DTR.debug { cause.backtrace.join("\n") }
+        self.run
+      rescue Exception => e
+        DTR.info{ "#{@test.name}, rescue an exception: #{e.message}, add error into result." }
+        @result.add_error(Test::Unit::Error.new(@test.name, e))
+        @result.add_run
+        @progress_block.call(Test::Unit::TestCase::FINISHED, @test.name)
+      end
+    end
+  end
+end

data/lib/dtr/test_unit/injection.rb

@@ -0,0 +1,29 @@
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'test/unit/ui/testrunnermediator'
+
+module DTR
+  def reject
+    return unless Test::Unit::UI::TestRunnerMediator.respond_to?(:reject_dtr)
+    Test::Unit::UI::TestRunnerMediator.reject_dtr
+  end
+
+  def inject
+    return if Test::Unit::UI::TestRunnerMediator.respond_to?(:reject_dtr)
+    Test::Unit::UI::TestRunnerMediator.send(:include, TestUnit::TestRunnerMediatorInjection)
+  end
+
+  module_function :reject, :inject
+end

data/lib/dtr/test_unit/test_case_injection.rb

@@ -0,0 +1,37 @@
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module DTR
+  module TestUnit
+    module TestCaseInjection
+      class Proxy
+        def initialize(test)
+          @test = test
+        end
+
+        def run(result, &progress_block)
+          DRbTestRunner.new(@test, result, &progress_block).run
+        end
+
+        def size
+          @test.size
+        end
+      end
+
+      def proxy
+        Proxy.new(self)
+      end
+    end
+  end
+end

data/lib/dtr/test_unit/test_suite_injection.rb

@@ -0,0 +1,24 @@
+# Copyright (c) 2007-2008 Li Xiao <iam@li-xiao.com>
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module DTR
+  module TestUnit
+    module TestSuiteInjection
+      def proxy
+        @tests.collect! {|t| t.proxy}
+        self
+      end
+    end
+  end
+end