xli-dtr 0.0.5 → 1.0.0

data/test/acceptance/general_test.rb

@@ -5,37 +5,20 @@ include DTR::AgentHelper
 class GeneralTest < Test::Unit::TestCase
   
   def setup
-    #start_agents first for test files loaded would be copied into sub processes
     start_agents
-    # put these here for we don't want run them in current process
-    @pwd = Dir.pwd
-    Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/../../testdata/"))
-    require 'a_test_case'
-    require 'a_test_case2'
-    require 'a_failed_test_case'
-    require 'an_error_test_case'
-    require 'a_file_system_test_case'
-    require 'scenario_test_case'
-    require 'setup_agent_env_test_case'
-
-    DTR.inject
   end
 
   def teardown
-    DTR.reject
-    Dir.chdir(@pwd)
     stop_agents
-    $argv_dup = nil
   end
 
   def test_run_test_passed
-    $argv_dup = ['a_test_case.rb', 'a_test_case2.rb', 'a_file_system_test_case.rb']
-    suite = Test::Unit::TestSuite.new('run_test_passed')
-    suite << ATestCase.suite
-    suite << ATestCase2.suite
-    suite << AFileSystemTestCase.suite
-
     assert_fork_process_exits_ok do
+      $argv_dup = ['a_test_case.rb', 'a_test_case2.rb', 'a_file_system_test_case.rb']
+      suite = Test::Unit::TestSuite.new('run_test_passed')
+      suite << ATestCase.suite
+      suite << ATestCase2.suite
+      suite << AFileSystemTestCase.suite
       @result = runit(suite)
 
       assert @result.passed?
@@ -46,12 +29,11 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_run_test_failed
-    $argv_dup = ['a_test_case.rb', 'a_failed_test_case.rb']
-    suite = Test::Unit::TestSuite.new('test_run_test_failed')
-    suite << ATestCase.suite
-    suite << AFailedTestCase.suite
-
     assert_fork_process_exits_ok do
+      $argv_dup = ['a_test_case.rb', 'a_failed_test_case.rb']
+      suite = Test::Unit::TestSuite.new('test_run_test_failed')
+      suite << ATestCase.suite
+      suite << AFailedTestCase.suite
       @result = runit(suite)
 
       assert !@result.passed?
@@ -62,12 +44,12 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_run_test_error
-    $argv_dup = ['a_test_case.rb', 'an_error_test_case.rb']
-    suite = Test::Unit::TestSuite.new('test_run_test_error')
-    suite << ATestCase.suite
-    suite << AnErrorTestCase.suite
-
     assert_fork_process_exits_ok do
+      $argv_dup = ['a_test_case.rb', 'an_error_test_case.rb']
+      suite = Test::Unit::TestSuite.new('test_run_test_error')
+      suite << ATestCase.suite
+      suite << AnErrorTestCase.suite
+
       @result = runit(suite)
 
       assert_false @result.passed?
@@ -78,11 +60,11 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_run_suite_should_be_independence
-    $argv_dup = ['an_error_test_case.rb']
-    suite = Test::Unit::TestSuite.new('test_run_suite_should_be_independence 1')
-    suite << AnErrorTestCase.suite
-
     assert_fork_process_exits_ok do
+      $argv_dup = ['an_error_test_case.rb']
+      suite = Test::Unit::TestSuite.new('test_run_suite_should_be_independence 1')
+      suite << AnErrorTestCase.suite
+
       @result = runit(suite)
 
       assert_false @result.passed?
@@ -91,11 +73,11 @@ class GeneralTest < Test::Unit::TestCase
       assert_equal 1, @result.error_count
     end
 
-    $argv_dup = ['a_test_case.rb']
-    suite = Test::Unit::TestSuite.new('test_run_suite_should_be_independence 2')
-    suite << ATestCase.suite
-
     assert_fork_process_exits_ok do
+      $argv_dup = ['a_test_case.rb']
+      suite = Test::Unit::TestSuite.new('test_run_suite_should_be_independence 2')
+      suite << ATestCase.suite
+
       @result = runit(suite)
 
       assert @result.passed?
@@ -106,11 +88,11 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_should_ignore_environment_file_not_exists
-    $argv_dup = ['a_test_case.rb', 'test_file_not_exists.rb']
-    suite = Test::Unit::TestSuite.new('test_run_test_file_not_exist')
-    suite << ATestCase.suite
-
     assert_fork_process_exits_ok do
+      $argv_dup = ['a_test_case.rb', 'test_file_not_exists.rb']
+      suite = Test::Unit::TestSuite.new('test_run_test_file_not_exist')
+      suite << ATestCase.suite
+
       @result = runit(suite)
 
       assert @result.passed?
@@ -121,10 +103,10 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_run_empty_test_suite_and_no_test_files_in_environment
-    $argv_dup = []
-    suite = Test::Unit::TestSuite.new('test_run_without_test_files')
-
     assert_fork_process_exits_ok do
+      $argv_dup = []
+      suite = Test::Unit::TestSuite.new('test_run_without_test_files')
+
       @result = runit(suite)
 
       assert @result.passed?
@@ -135,10 +117,10 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_run_empty_test_suite_should_not_crash_agent
-    $argv_dup = []
-    suite = Test::Unit::TestSuite.new('test_run_empty_test_suite_should_not_crash_agent')
-
     assert_fork_process_exits_ok do
+      $argv_dup = []
+      suite = Test::Unit::TestSuite.new('test_run_empty_test_suite_should_not_crash_agent')
+
       @result = runit(suite)
 
       assert @result.passed?
@@ -147,9 +129,11 @@ class GeneralTest < Test::Unit::TestCase
       assert_equal 0, @result.error_count
     end
 
-    $argv_dup = ['a_test_case.rb']
-    suite << ATestCase.suite
     assert_fork_process_exits_ok do
+      $argv_dup = ['a_test_case.rb']
+      suite = Test::Unit::TestSuite.new('test_run_empty_test_suite_should_not_crash_agent')
+      suite << ATestCase.suite
+
       @result = runit(suite)
 
       assert @result.passed?
@@ -160,10 +144,10 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_run_empty_test_suite_and_test_files_not_exist_in_environment
-    $argv_dup = ['test_file_not_exists.rb']
-    suite = Test::Unit::TestSuite.new('test_run_empty_test_suite_and_test_files_not_exist_in_environment')
-
     assert_fork_process_exits_ok do
+      $argv_dup = ['test_file_not_exists.rb']
+      suite = Test::Unit::TestSuite.new('test_run_empty_test_suite_and_test_files_not_exist_in_environment')
+
       @result = runit(suite)
 
       assert @result.passed?
@@ -174,14 +158,14 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_run_test_specified_by_load_path
-    lib_path = File.expand_path(File.dirname(__FILE__) + '/../../testdata/lib')
-    $LOAD_PATH.unshift lib_path
-    require 'lib_test_case'
-    $argv_dup = ['lib_test_case.rb']
-    suite = Test::Unit::TestSuite.new('test_run_test_specified_by_load_path')
-    suite << LibTestCase.suite
-
     assert_fork_process_exits_ok do
+      lib_path = File.expand_path(File.dirname(__FILE__) + '/../../testdata/lib')
+      $LOAD_PATH.unshift lib_path
+      require 'lib_test_case'
+      $argv_dup = ['lib_test_case.rb']
+      suite = Test::Unit::TestSuite.new('test_run_test_specified_by_load_path')
+      suite << LibTestCase.suite
+
       @result = runit(suite)
 
       assert @result.passed?
@@ -189,16 +173,14 @@ class GeneralTest < Test::Unit::TestCase
       assert_equal 0, @result.failure_count
       assert_equal 0, @result.error_count
     end
-  ensure
-    $LOAD_PATH.delete lib_path
   end
 
   def test_message_of_errors_and_failures_should_include_runner_host_name
-    $argv_dup = ['scenario_test_case.rb']
-    suite = Test::Unit::TestSuite.new('test_should_wrapper_errors_by_dtr_remote_exception')
-    suite << ScenarioTestCase.suite
-
     assert_fork_process_exits_ok do
+      $argv_dup = ['scenario_test_case.rb']
+      suite = Test::Unit::TestSuite.new('test_should_wrapper_errors_by_dtr_remote_exception')
+      suite << ScenarioTestCase.suite
+
       @result = runit(suite)
 
       assert !@result.passed?
@@ -216,11 +198,12 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_setup_agent_env_from_master_process
-    $argv_dup = ['setup_agent_env_test_case.rb']
-    suite = Test::Unit::TestSuite.new('setup_agent_env_from_master_process')
-    suite << SetupAgentEnvTestCase.suite
-    ENV['DTR_AGENT_ENV_SETUP_CMD'] = 'touch /tmp/test_setup_agent_env_from_master_process'
     assert_fork_process_exits_ok do
+      $argv_dup = ['setup_agent_env_test_case.rb']
+      suite = Test::Unit::TestSuite.new('setup_agent_env_from_master_process')
+      suite << SetupAgentEnvTestCase.suite
+      ENV['DTR_AGENT_ENV_SETUP_CMD'] = 'touch /tmp/test_setup_agent_env_from_master_process'
+
       @result = runit(suite)
       assert @result.passed?
       assert_equal 1, @result.run_count
@@ -229,23 +212,25 @@ class GeneralTest < Test::Unit::TestCase
     end
   ensure
     File.delete('/tmp/test_setup_agent_env_from_master_process') rescue nil
-    ENV['DTR_AGENT_ENV_SETUP_CMD'] = nil
   end
 
   def test_multi_dtr_tasks_should_be_queued_and_processed_one_by_one
-    testdata_dir = File.expand_path('./../testdata')
-    $argv_dup = ['a_test_case.rb', 'a_test_case2.rb', 'a_file_system_test_case.rb']
-    suite = Test::Unit::TestSuite.new('run_test_passed')
-    suite << ATestCase.suite
-    suite << ATestCase2.suite
-    suite << AFileSystemTestCase.suite
+    testdata_dir = File.expand_path(File.dirname(__FILE__) + "/../../testdata/")
     process_assertion = Proc.new do |master_dir|
       FileUtils.cp_r testdata_dir, master_dir
       begin
         Dir.chdir(master_dir) do
-          result = runit(suite)
-          assert result.passed?
-          assert_equal 3, result.run_count
+          $argv_dup = ['a_test_case.rb', 'a_test_case2.rb', 'a_file_system_test_case.rb']
+          setup_test_env
+          suite = Test::Unit::TestSuite.new('run_test_passed')
+          suite << ATestCase.suite
+          suite << ATestCase2.suite
+          suite << AFileSystemTestCase.suite
+          with_agent_helper_group do
+            result = runit(suite)
+            assert result.passed?
+            assert_equal 3, result.run_count
+          end
         end
       ensure
         FileUtils.rm_rf master_dir
@@ -269,7 +254,78 @@ class GeneralTest < Test::Unit::TestCase
     assert_equal 0, $?.exitstatus
   ensure
     @test_processes.each do |pid|
-      Process.kill 'TERM', pid rescue nil
+      DTR.kill_process pid
+    end
+  end
+
+  def test_run_test_case_hacked_run_method
+    assert_fork_process_exits_ok do
+      require 'hacked_run_method_test_case'
+
+      $argv_dup = ['hacked_run_method_test_case.rb']
+      suite = Test::Unit::TestSuite.new('run_test_case_hacked_run_method')
+      suite << HackedRunMethodTestCase.suite
+
+      @result = runit(suite)
+
+      assert @result.passed?
+      assert_equal 1, @result.run_count
+      assert_equal 0, @result.failure_count
+      assert_equal 0, @result.error_count
+    end
+  end
+
+  def test_should_not_break_heartbeat_of_master_process_when_run_with_a_test_case_sleep_long_time
+    assert_fork_process_exits_ok do
+      DTR.configuration.master_heartbeat_interval = 1
+      DTR.configuration.follower_listen_heartbeat_timeout = 2
+
+      require 'sleep_3_secs_test_case'
+
+      $argv_dup = ['sleep_3_secs_test_case.rb']
+      suite = Test::Unit::TestSuite.new('run_test_case_sleep_3_secs')
+      suite << Sleep3SecsTestCase.suite
+
+      @result = runit(suite)
+
+      assert @result.passed?
+      assert_equal 1, @result.run_count
+      assert_equal 0, @result.failure_count
+      assert_equal 0, @result.error_count
+    end
+  end
+
+  def test_should_add_meaningful_error_when_runner_get_a_unknown_test
+    assert_fork_process_exits_ok do
+      $argv_dup = ['a_failed_test_case.rb']
+      suite = Test::Unit::TestSuite.new('should_add_meaningful_error_when_runner_get_a_unknown_test')
+      suite << ATestCase.suite
+
+      @result = runit(suite)
+
+      assert !@result.passed?
+      assert_equal 1, @result.run_count
+      assert_equal 0, @result.failure_count
+      assert_equal 1, @result.error_count
+      assert_equal "DTR::RemoteError: DTR::Agent::UnknownTestError from #{Socket.gethostname}: No such test loaded: ATestCase", @result.errors.first.message
+    end
+  end
+
+  def test_run_test_timeout
+    assert_fork_process_exits_ok do
+      require 'sleep_3_secs_test_case'
+      $argv_dup = ['sleep_3_secs_test_case.rb']
+      suite = Test::Unit::TestSuite.new('run_test_case_sleep_3_secs')
+      suite << Sleep3SecsTestCase.suite
+
+      ENV['RUN_TEST_TIMEOUT'] = '1'
+      @result = runit(suite)
+
+      assert !@result.passed?
+      assert_equal 1, @result.run_count
+      assert_equal 0, @result.failure_count
+      assert_equal 1, @result.error_count
+      assert @result.errors.first.message.include?('Timeout')
     end
   end
 end

data/test/acceptance/raketasks_test.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../test_helper'
+include DTR::AgentHelper
+
+class RakeTasksTest < Test::Unit::TestCase
+  def test_test_task
+    FileUtils.mkdir_p("raketasks_test_agent")
+    Dir.chdir('raketasks_test_agent') do
+      start_agents
+    end
+    test_dir = File.expand_path(File.dirname(__FILE__) + '/../../testdata/raketasks')
+    Dir.chdir(test_dir) do
+      output = %x[rake dtr]
+      expected = <<-OUTPUT
+1 tests, 1 assertions, 0 failures, 0 errors
+OUTPUT
+      assert_equal 0, $?.exitstatus
+      assert output.include?(expected), "should include #{expected}"
+    end
+  ensure
+    stop_agents
+    FileUtils.rm_rf("raketasks_test_agent")
+  end
+end

data/test/acceptance/sync_codebase_test.rb

@@ -12,7 +12,7 @@ class SyncCodebaseTest < Test::Unit::TestCase
       DTR.configuration.with_rinda_server do
         Dir.chdir(testdata_dir) do
           DTR::Cmd.execute('rake dtr_repackage')
-          provide_file DTR::SyncCodebase::Codebase.new
+          provide_file DTR::SyncCodebase::CopiablePackage.new
           DRb.thread.join
         end
       end
@@ -31,8 +31,8 @@ class SyncCodebaseTest < Test::Unit::TestCase
     assert !File.exists?("test_sync_codebase/#{package_copy_file}")
   ensure
     stop_service rescue nil
-    Process.kill 'TERM', master rescue nil
-    Process.kill 'TERM', client rescue nil
+    DTR.kill_process master
+    DTR.kill_process client
     FileUtils.rm_rf("test_sync_codebase")
     Dir.chdir(testdata_dir) do
       DTR::Cmd.execute('rake dtr_clobber_package')
@@ -40,17 +40,17 @@ class SyncCodebaseTest < Test::Unit::TestCase
   end
 
   def test_should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process
-    @master_dir = File.expand_path(File.dirname(__FILE__) + '/../../testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process')
-    Dir.chdir(@master_dir) do
-      require 'verify_dir_pwd_test_case'
-    end
-    $argv_dup = ['verify_dir_pwd_test_case.rb']
-    suite = Test::Unit::TestSuite.new('test_should_not_sync_codebase_and_setup_working_dir')
-    suite << VerifyDirPwdTestCase.suite
+    @master_dir = File.expand_path(File.dirname(__FILE__) + '/../../testdata/verify_dir_pwd')
     @agent = start_agent_at @master_dir, 2, false
     begin
-      DTR.inject
       assert_fork_process_exits_ok do
+        Dir.chdir(@master_dir) do
+          require 'verify_dir_pwd_test_case'
+        end
+        $argv_dup = ['verify_dir_pwd_test_case.rb']
+        suite = Test::Unit::TestSuite.new('test_should_not_sync_codebase_and_setup_working_dir')
+        suite << VerifyDirPwdTestCase.suite
+
         Dir.chdir(@master_dir) do
           result = runit(suite)
           assert result.passed?
@@ -58,8 +58,7 @@ class SyncCodebaseTest < Test::Unit::TestCase
         end
       end
     ensure
-      DTR.reject
-      Process.kill 'TERM', @agent rescue nil
+      DTR.kill_process @agent
       Process.waitall
     end
   end

data/test/acceptance/sync_logger_test.rb

@@ -6,36 +6,27 @@ class SyncLoggerTest < Test::Unit::TestCase
   
   def setup
     start_agents
-    # put these here for we don't want run them in current process
-    @pwd = Dir.pwd
-    Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/../../testdata/"))
-    require 'a_test_case'
-    @logger = LoggerStub.new
-    DTR.logger = @logger
-    DTR.inject
   end
 
   def teardown
-    DTR.reject
-    Dir.chdir(@pwd)
     stop_agents
-    $argv_dup = nil
-    DTR.logger = nil
-    @logger.clear
   end
 
-  #todo fix random failure
   def test_master_process_should_get_log_of_agents
-    $argv_dup = ['a_test_case.rb']
-    suite = Test::Unit::TestSuite.new('test_master_process_should_get_log_of_agents')
-    suite << ATestCase.suite
     assert_fork_process_exits_ok do
+      @logger = LoggerStub.new
+      DTR.logger = @logger
+
+      $argv_dup = ['a_test_case.rb']
+      suite = Test::Unit::TestSuite.new('master_process_should_get_log_of_agents')
+      suite << ATestCase.suite
       runit(suite)
+
+      logs = @logger.logs.flatten.join("\n")
+      assert(/From #{Socket.gethostname}: => Herald starts off\.\.\./ =~ logs)
+      assert(/From #{Socket.gethostname}: runner0: test files loaded/ =~ logs)
+      #when use Delegator to implement UndumpedLogger, there are lots of 'nil' in the log
+      assert(/nil/ !~ logs)
     end
-    logs = @logger.logs.flatten.join("\n")
-    assert(/From #{Socket.gethostname}: => Herald starts off\.\.\./ =~ logs)
-    assert(/From #{Socket.gethostname}: runner0: test files loaded/ =~ logs)
-    #when use Delegator to implement UndumpedLogger, there are lots of 'nil' in the log
-    assert(/nil/ !~ logs)
   end
 end

data/test/agent_helper.rb

@@ -1,10 +1,11 @@
 require 'fileutils'
 module DTR
   module AgentHelper
-    def start_agents
+    GROUP = 'dtr acceptance tests'
+    def start_agents(size = 3)
       @agents_dir = File.join(Dir.pwd, 'agents')
       @agents = []
-      @agents << start_agent_at(File.join(@agents_dir, 'agent1'), 3)
+      @agents << start_agent_at(File.join(@agents_dir, 'agent1'), size)
       # @agents << start_agent_at(File.join(@agents_dir, 'agent2'), 1)
     end
 
@@ -14,13 +15,9 @@ module DTR
       runner_names = []
       size.times {|i| runner_names << "runner#{i}"}
       Process.fork do
-        begin
-          Dir.chdir(agent_dir) do
-            DTR.launch_agent(runner_names, nil)
-          end
-        rescue Exception => e
-          puts e.message
-          puts e.backtrace.join("\n")
+        Dir.chdir(agent_dir) do
+          DTR.configuration.group = GROUP
+          DTR.launch_agent(runner_names, nil)
         end
       end
     end
@@ -28,9 +25,10 @@ module DTR
     def stop_agents
       if @agents
         @agents.each do |agent|
-          Process.kill 'TERM', agent rescue nil
+          DTR.kill_process agent
         end
         Process.waitall
+        sleep 1
       end
     ensure
       FileUtils.rm_rf(@agents_dir) rescue nil

data/test/logger_stub.rb

@@ -15,6 +15,10 @@ class LoggerStub
     output(:error, message, &block)
   end
 
+  def level
+    Logger::INFO
+  end
+
   def output(level, msg=nil, &block)
     message = block_given? ? block.call : msg.to_s
     @store << [:logs, [level, message]]

data/test/test_helper.rb

@@ -4,11 +4,11 @@ require 'test/unit/ui/console/testrunner'
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
-# require 'growling_test'
+require 'growling_test'
 require 'dtr'
 require 'dtr/test_unit'
-# DTR.configuration.master_yell_interval = 2
-# DTR.configuration.follower_listen_sleep_timeout = 3
+DTR.configuration.master_heartbeat_interval = 2
+DTR.configuration.follower_listen_heartbeat_timeout = 3
 
 require File.dirname(__FILE__) + '/agent_helper'
 require File.dirname(__FILE__) + '/logger_stub'
@@ -23,17 +23,45 @@ module Test
       end
       def assert_fork_process_exits_ok(&block)
         pid = Process.fork do
-          block.call
+          Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/../testdata/")) do
+            setup_test_env
+            with_agent_helper_group(&block)
+          end
           exit 0
         end
         Process.waitpid pid
         assert_equal 0, $?.exitstatus
       ensure
-        Process.kill 'TERM', pid rescue nil
+        DTR.kill_process pid
+      end
+
+      def with_agent_helper_group(&block)
+        DTR.configuration.group = DTR::AgentHelper::GROUP
+        begin
+          block.call
+        ensure
+          DTR.configuration.group = nil
+        end
       end
+
+      def setup_test_env
+        require 'a_test_case'
+        require 'a_test_case2'
+        require 'a_failed_test_case'
+        require 'an_error_test_case'
+        require 'a_file_system_test_case'
+        require 'scenario_test_case'
+        require 'setup_agent_env_test_case'
+        DTR.inject
+      end
+
       def runit(suite)
         Test::Unit::UI::Console::TestRunner.run(suite, Test::Unit::UI::SILENT)
       end
+      def clear_configuration
+        DTR::EnvStore.destroy
+        DTR.configuration.load
+      end
     end
   end
 end