dtr 0.0.3 → 0.0.4

data/CHANGES

@@ -1,5 +1,11 @@
 = DTR Changelog
 
+== release 0.0.4
+* added timeout for running test more stable
+  the default timeout is 60 sec, can be changed by environment variable 'RUN_TEST_TIMEOUT'
+* output master process log into different log file with runners
+
+
 == release 0.0.3
 * more stable and maintainable
 * added monitor command for monitoring the server status

data/README

@@ -33,7 +33,7 @@ grid".
 
 The latest version of DTR can be found at
 
-* http://rubyforge.org/projects/dtr/
+* http://github.com/xli/dtr/tree/master
 
 == Installation
 
@@ -60,12 +60,6 @@ If you wish to run the unit and functional tests that come with DTR:
 
    rake # You need a version of rake installed
 
-== DTR References
-
-* DTR Documentation Home: http://dtr.rubyforge.org
-* DTR Project Page: http://rubyforge.org/projects/dtr
-* DTR API Documents: http://dtr.rubyforge.org
-
 == Simple Example
 
 Once installed, you can run DTR server anywhere:
@@ -250,16 +244,11 @@ DTR is available under an Apache License Version 2.
 
 == Support
 
-The DTR homepage is http://dtr.rubyforge.org.  You can find the DTR
-RubyForge page at http://rubyforge.org/projects/dtr or Google Code 
-project at http://code.google.com/p/dtrunner.
-
 Feel free to submit commits or feature requests.  If you send a patch,
 remember to update the corresponding unit tests.  If fact, I prefer
 new feature to be submitted in the form of new unit tests.
 
-For other information, feel free to ask on the ruby-talk mailing list 
-or contact mailto:swing1979@gmail.com.
+For other information, feel free to contact mailto:swing1979@gmail.com.
 
 == Usage
 

data/Rakefile

@@ -130,67 +130,15 @@ rd = Rake::RDocTask.new("rdoc") { |rdoc|
 # Create a task that will package the DTR software into distributable
 # tar, zip and gem files.
 
-PKG_FILES = FileList[
-  'install.rb',
-  '[A-Z]*',
-  'bin/**/*', 
-  'lib/**/*.rb', 
-  'lib/**/*.rake', 
-  'test/**/*.rb',
-  'doc/**/*'
-]
-PKG_FILES.exclude('doc/example/*.o')
-PKG_FILES.exclude(%r{doc/example/main$})
-
 if ! defined?(Gem)
   puts "Package Target requires RubyGEMs"
 else
-  spec = Gem::Specification.new do |s|
-    
-    #### Basic information.
-
-    s.name = 'dtr'
-    s.version = $package_version
-    s.summary = "DTR is a distributed test runner to run tests on distributed computers for decreasing build time."
-
-    #### Dependencies and requirements.
-
-    s.add_dependency('daemons', '> 1.0.7')
-    #s.requirements << ""
-
-    #### Which files are to be included in this gem?  Everything!  (Except SVN directories.)
-
-    s.files = PKG_FILES.to_a.delete_if {|item| item.include?(".svn")}
-
-    #### Load-time details: library and application (you will need one or both).
-
-    s.require_path = 'lib'                         # Use these for libraries.
-
-    s.bindir = "bin"                               # Use these for applications.
-    s.executables = ["dtr"]
-    s.default_executable = "dtr"
-
-    #### Documentation and testing.
-
-    s.has_rdoc = true
-    s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
-    s.rdoc_options = rd.options
-
-    #### Author and project details.
-
-    s.author = "Li Xiao"
-    s.email = "swing1979@gmail.com"
-    s.homepage = "http://dtr.rubyforge.org"
-    s.rubyforge_project = "dtr"
-#     if ENV['CERT_DIR']
-#       s.signing_key = File.join(ENV['CERT_DIR'], 'gem-private_key.pem')
-#       s.cert_chain  = [File.join(ENV['CERT_DIR'], 'gem-public_cert.pem')]
-#     end
-  end
-
-  package_task = Rake::GemPackageTask.new(spec) do |pkg|
-    #pkg.need_zip = true
-    #pkg.need_tar = true
+  File.open(File.dirname(__FILE__) + '/dtr.gemspec') do |f|
+    spec = eval(f.read)
+    package_task = Rake::GemPackageTask.new(spec) do |pkg|
+      #pkg.need_zip = true
+      #pkg.need_tar = true
+    end
   end
 end
 

data/dtr.gemspec

@@ -0,0 +1,34 @@
+Gem::Specification.new do |spec|
+  spec.name = 'dtr'
+  spec.version = "0.0.4"
+  spec.summary = "DTR is a distributed test runner to run tests on distributed computers for decreasing build time."
+
+  #### Dependencies and requirements.
+
+  spec.add_dependency('daemons', '> 1.0.7')
+  #s.requirements << ""
+
+  #### Which files are to be included in this gem?  Everything!  (Except SVN directories.)
+
+  spec.files = FileList['lib/**/*.rb', 'lib/**/*.rake', 'bin/*', '[a-zA-Z]*'].to_a
+  p FileList['lib/**/*.rb', 'lib/**/*.rake', 'bin/*', '[a-zA-Z]*'].to_a
+
+  #### Load-time details: library and application (you will need one or both).
+
+  spec.require_path = 'lib'                         # Use these for libraries.
+
+  spec.bindir = "bin"                               # Use these for applications.
+  spec.executables = ["dtr"]
+  spec.default_executable = "dtr"
+
+  #### Documentation and testing.
+
+  spec.has_rdoc = false
+
+  #### Author and project details.
+
+  spec.author = "Li Xiao"
+  spec.email = "swing1979@gmail.com"
+  spec.homepage = "http://github.com/xli/dtr/tree/master"
+  spec.rubyforge_project = "dtr"
+end

data/lib/dtr.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DTRVERSION="0.0.3"
+DTRVERSION="0.0.4"
 DTROPTIONS = {} unless defined?(DTROPTIONS)
 
 require 'fileutils'

data/lib/dtr/base.rb

@@ -16,6 +16,18 @@ require 'pstore'
 
 require 'logger'
 
+class Array
+  def blank?
+    empty?
+  end
+end
+
+class NilClass
+  def blank?
+    true
+  end
+end
+
 module DTR
   
   MESSAGE_KEY = :message
@@ -30,7 +42,7 @@ module DTR
       else
         DTROPTIONS[:log_file] || 'dtr.log'
       end
-      Logger.new(log_file, 1, 5*1024*1024)
+      Logger.new("./#{log_file}", 1, 5*1024*1024)
     end
     DTROPTIONS[:logger].datetime_format = "%m-%d %H:%M:%S"
     DTROPTIONS[:logger].level = DTROPTIONS[:log_level] || Logger::INFO

data/lib/dtr/raketasks.rb

@@ -60,6 +60,7 @@ module DTR
     
     private
     def start_runners
+      return if self.processes.to_i <= 0
       runner_names = []
       self.processes.to_i.times {|i| runner_names << "runner#{i}"}
       %x[dtr -r #{runner_names.join(',')} -D #{runner_options}]

data/lib/dtr/runner.rb

@@ -39,15 +39,15 @@ module DTR
 
   class RunnerAgent
     
-    def self.start(runner_names=["Distributed Test Runner"], setup_cmd=nil)
+    def self.start(runner_names=["Distributed Test Runner"], setup_agent_env_cmd=nil)
       DTR.with_monitor do 
-        new(runner_names, setup_cmd).launch
+        new(runner_names, setup_agent_env_cmd).launch
       end
     end
     
-    def initialize(runner_names, setup_cmd)
+    def initialize(runner_names, setup_agent_env_cmd)
       @runner_names = runner_names.is_a?(Array) ? runner_names : [runner_names.to_s]
-      @setup_cmd = setup_cmd || ""
+      @setup_agent_env_cmd = setup_agent_env_cmd || ""
       @runner_pids = []
       @herald = nil
       @working_env_key = :working_env
@@ -85,7 +85,7 @@ module DTR
           kill_all_runners
           ENV['DTR_MASTER_ENV'] = working_env[:dtr_master_env]
 
-          if Cmd.execute(@setup_cmd)
+          if Cmd.execute(@setup_agent_env_cmd || working_env[:setup_agent_env_cmd])
             @runner_names.each do |name| 
               @runner_pids << drb_fork { Runner.start name, working_env }
             end
@@ -100,7 +100,7 @@ module DTR
     private
     
     def kill_all_runners
-      unless @runner_pids.empty?
+      unless @runner_pids.blank?
         @runner_pids.each{ |pid| Process.kill 'KILL', pid rescue nil }
         DTR.info "=> All runners(#{@runner_pids.join(", ")}) were killed." 
         @runner_pids = []
@@ -139,7 +139,7 @@ module DTR
     def beat
       loop do
         begin
-          if @env_store[@key].empty?
+          if @env_store[@key].blank?
             @provider.send_message('---/V---')
           else
             while message = @env_store[@key].first
@@ -179,7 +179,7 @@ module DTR
         begin
           working_env = @provider.working_env
           DTR.debug { "working env: #{working_env.inspect}" }
-          if working_env[:files].empty?
+          if working_env[:files].blank?
             DTR.error "No test files need to load?(working env: #{working_env.inspect})"
           else
             @env_store[@key] = working_env if @env_store[@key].nil? || @env_store[@key][:identifier] != working_env[:identifier]
@@ -253,6 +253,11 @@ module DTR
       @provider.provide(self)
     end
     
+    def reboot
+      DTR.info "#{self} is rebooting. Ran #{@started.size} tests, finished #{@run_finished.size}."
+      @provider.provide(self)
+    end
+    
     def shutdown
       DTR.info "#{self} is shutting down. Ran #{@started.size} tests, finished #{@run_finished.size}."
       @provider.stop_service rescue exit!

data/lib/dtr/test_unit.rb

@@ -18,8 +18,10 @@ require 'test/unit/testcase'
 require 'test/unit/util/observable'
 require 'monitor'
 require 'drb'
+require 'timeout'
 
 DTROPTIONS = {} unless defined?(DTROPTIONS)
+DTROPTIONS[:log_file] = 'dtr_master_process.log' unless DTROPTIONS[:log_file]
 
 module DTR
   def reject
@@ -57,7 +59,7 @@ module DTR
     def add_finish_count
       synchronize do
         @finish_count += 1
-        @complete_cond.signal if complete?
+        @complete_cond.signal
       end
     end
     
@@ -69,18 +71,18 @@ module DTR
     
     def wait_until_complete
       synchronize do
-        @complete_cond.wait_until {complete?} unless complete?
+        @complete_cond.wait_until {complete?}
       end
     end
     
     private
     def complete?
-      DTR.debug {"Counter status: #{status}"}
+      DTR.info{ "Counter status: #{status}" }
       @finish_count >= @start_count
     end
     
     def status
-      "finish_count: #{@finish_count}; start_count: #{@start_count}"
+      "finish_count => #{@finish_count}, start_count => #{@start_count}"
     end
   end
   
@@ -162,6 +164,7 @@ module DTR
     end
     
     RUN_TEST_FINISHED = "::DRbTestRunner::RUN_TEST_FINISHED"
+    DEFAULT_RUN_TEST_TIMEOUT = 60 #seconds
     
     def initialize(test, result, &progress_block)
       @test = test
@@ -182,10 +185,17 @@ module DTR
     def run_test_on(runner)
       Thread.start do
         begin
-          runner.run(@test, @result, &@progress_block)
+          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}" }
+          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." }
@@ -235,7 +245,7 @@ module DTR
         alias_method :__run__, :run
         
         def run(result, &progress_block)
-          DTR.debug { "start of run suite(#{name}), size: #{size};"}
+          DTR.info { "start of run suite(#{name}), size: #{size};"}
           
           if result.kind_of?(ThreadSafeTestResult)
             __run__(result, &progress_block)
@@ -246,7 +256,8 @@ module DTR
             
             DTR.service_provider.setup_working_env WorkingEnv.refresh
             
-            puts 'Refreshed dtr working environment, looking for runner service...' unless DTR.silent?
+            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}" }
@@ -259,7 +270,7 @@ module DTR
             DTR.debug { "==> teardown" }
             DTR.service_provider.teardown_working_env
           end
-          DTR.debug { "end of run suite(#{name}), test result status: #{result}, counter status: #{DRbTestRunner.counter}"}
+          DTR.info { "end of run suite(#{name}), test result status: #{result}, counter status: #{DRbTestRunner.counter}"}
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dtr
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Li Xiao
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-28 00:00:00 +08:00
+date: 2008-09-02 00:00:00 +08:00
 default_executable: dtr
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -27,19 +28,9 @@ executables:
 - dtr
 extensions: []
 
-extra_rdoc_files: 
-- README
-- LICENSE.txt
-- TODO
-- CHANGES
+extra_rdoc_files: []
+
 files: 
-- install.rb
-- CHANGES
-- LICENSE.TXT
-- Rakefile
-- README
-- TODO
-- bin/dtr
 - lib/dtr/base.rb
 - lib/dtr/raketasks.rb
 - lib/dtr/runner.rb
@@ -47,23 +38,28 @@ files:
 - lib/dtr/test_unit.rb
 - lib/dtr/test_unit_injection.rb
 - lib/dtr.rb
-- test/base_test.rb
-- test/logger_test.rb
-- test/scenario_tests.rb
-- test/test_helper.rb
-- test/test_unit_test.rb
-- doc/jamis.rb
-- LICENSE.txt
-has_rdoc: true
-homepage: http://dtr.rubyforge.org
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --main
+- bin/dtr
+- bin
+- CHANGES
+- doc
+- dtr.gemspec
+- html
+- install.rb
+- lib
+- LICENSE.TXT
+- log
+- pkg
+- Rakefile
 - README
-- --title
-- "\"DTR -- Distributed Test Runner"
+- rspec
+- test
+- testdata
+- TODO
+has_rdoc: false
+homepage: http://github.com/xli/dtr/tree/master
+post_install_message: 
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -81,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dtr
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: DTR is a distributed test runner to run tests on distributed computers for decreasing build time.