xli-dtr 0.0.5 → 1.0.0

data/test/unit/adapter_test.rb

@@ -2,18 +2,20 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 include DTR::AgentHelper
 
-class AdapterTests < Test::Unit::TestCase
+class AdapterTest < Test::Unit::TestCase
   include DTR::Adapter::Master
   include DTR::Adapter::Follower
 
   def setup
+    @host_ip = nil
     @timeout = false
     @messages = []
-    DTR.configuration.follower_listen_sleep_timeout = 1
+    DTR.logger('test.log')
+    DTR.configuration.follower_listen_heartbeat_timeout = 1
   end
 
   def teardown
-    DTR.configuration.follower_listen_sleep_timeout = 15
+    clear_configuration
   end
 
   def test_should_be_sleep_if_never_wakeup
@@ -28,12 +30,12 @@ class AdapterTests < Test::Unit::TestCase
 
   def test_wakeup_by_broadcast_message
     assert !wakeup?
-    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} #{Socket.gethostname}:4567")
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 4567")
     assert wakeup?
   end
 
   def test_should_be_sleep_after_hypnotized_waked_up_agents
-    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} #{Socket.gethostname}:4567")
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 4567")
     assert wakeup?
     hypnotize_agents
     assert sleep?
@@ -56,27 +58,31 @@ class AdapterTests < Test::Unit::TestCase
   end
 
   def test_should_not_be_sleep_when_sleep_message_is_sent_from_different_port_with_wakeup_message
-    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} hostname:1234")
+    @host_ip = '10.18.1.1'
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234")
     assert wakeup?
     #sleep message should be ignored
-    broadcast('address', "#{DTR::Adapter::SLEEP_MESSAGE} hostname:4567")
+    broadcast('address', "#{DTR::Adapter::SLEEP_MESSAGE} 4567")
     #wakup message for keep it wakeup
-    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} hostname:1234")
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234")
     assert !sleep?
   end
 
   def test_should_not_be_sleep_when_sleep_message_is_sent_from_different_hostname_with_wakeup_message
-    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} xli.local:1234")
+    @host_ip = '10.18.1.1'
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234")
     assert wakeup?
     #sleep message should be ignored
-    broadcast('address', "#{DTR::Adapter::SLEEP_MESSAGE} dtr.remote:1234")
+    @host_ip = '192.168.1.1'
+    broadcast('address', "#{DTR::Adapter::SLEEP_MESSAGE} 1234")
     #wakup message for keep it wakeup
-    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} xli.local:1234")
+    @host_ip = '10.18.1.1'
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234")
     assert !sleep?
   end
 
   def test_should_update_rinda_server_port_parsed_from_wakeup_message
-    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} hostname:4567")
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 4567")
     assert wakeup?
     assert_equal 4567, DTR.configuration.rinda_server_port
   end
@@ -89,19 +95,55 @@ class AdapterTests < Test::Unit::TestCase
   end
 
   def test_should_be_sleep_when_timeout_on_listen_to_host_sending_wakeup_message
-    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} xli.local:1234")
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234")
     assert wakeup?
-    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} dtr.remote:1234")
+    @host_ip = 'dtr.remote'
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234")
     sleep(2)
     assert sleep?
   end
 
+  def test_should_match_group_configured_when_receive_wakeup_cmd
+    DTR.configuration.group = 'mingle'
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234")
+    assert !wakeup?
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234 mingle")
+    assert wakeup?
+  end
+
+  def test_should_not_need_match_group_configured_when_receive_sleep_cmd
+    DTR.configuration.group = 'mingle'
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234 mingle")
+    assert wakeup?
+    broadcast('address', "#{DTR::Adapter::SLEEP_MESSAGE} 1234")
+    assert sleep?
+  end
+
+  def test_do_wakeup_agents_should_include_group_configured
+    DTR.configuration.group = 'mingle'
+    do_wakeup_agents
+    assert wakeup?
+  end
+
+  def test_should_reset_broadcast_configuration_as_master_process_ip
+    @host_ip = '10.18.1.1'
+    broadcast('address', "#{DTR::Adapter::WAKEUP_MESSAGE} 1234")
+    assert wakeup?
+    assert_equal ['10.18.1.1'], DTR.configuration.broadcast_list
+  end
+
   def listen
     raise Timeout::Error.new('timeout') if @timeout
-    @messages.shift.to_s.split
+    cmd, port, group, host_ip = @messages.shift.to_s.split
+    if host_ip.nil?
+      host_ip = group
+      group = nil
+    end
+    [cmd, "#{host_ip}:#{port}", group]
   end
 
   def broadcast(it, msg)
-    @messages << msg
+    host_ip = @host_ip || Socket.gethostname
+    @messages << "#{msg} #{host_ip}"
   end
 end

data/test/unit/configuration_test.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ConfigurationTest < Test::Unit::TestCase
+  def teardown
+    clear_configuration
+  end
+
+  def test_should_not_save_rinda_server_port
+    DTR.configuration.rinda_server_port = '3456'
+    assert_equal '3456', DTR.configuration.rinda_server_port
+    assert_nil DTR::EnvStore.new[:rinda_server_port]
+  end
+
+  def test_group_defualt_is_dangerous_group
+    assert_nil DTR.configuration.group
+  end
+
+  def test_group
+    DTR.configuration.group = 'mingle'
+    assert_equal 'mingle', DTR.configuration.group
+    DTR.configuration.save
+    assert_equal 'mingle', DTR::EnvStore.new[:group]
+  end
+
+  def test_should_save_as_nil_when_group_is_blank
+    DTR.configuration.group = ''
+    assert_nil DTR.configuration.group
+    DTR.configuration.save
+    assert_nil DTR::EnvStore.new[:group]
+  end
+
+  def test_shoul_convert_space_in_group_name_to_underscore
+    DTR.configuration.group = 'mingle group'
+    assert_equal 'mingle_group', DTR.configuration.group
+    DTR.configuration.save
+    assert_equal 'mingle_group', DTR::EnvStore.new[:group]
+  end
+
+  def test_load
+    DTR::EnvStore.new[:group] = 'new group'
+    DTR.configuration.load
+    assert_equal 'new group', DTR.configuration.group
+  end
+end

data/test/unit/facade_test.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'dtr/facade'
+
+class FacadeTest < Test::Unit::TestCase
+  include DTR::Facade
+
+  def teardown
+    clear_configuration
+  end
+
+  def test_lib_path
+    expected = File.expand_path(File.dirname(__FILE__) + '/../../lib')
+    assert_equal expected, lib_path
+  end
+
+  def test_save_broadcast_list
+    self.broadcast_list = ['10.18.255.255']
+    assert_equal ['10.18.255.255'], DTR::EnvStore.new[:broadcast_list]
+  end
+
+  def test_save_group
+    self.group = 'mingle'
+    assert_equal 'mingle', DTR::EnvStore.new[:group]
+  end
+
+  def test_save_agent_listen_port
+    self.agent_listen_port = '7890'
+    assert_equal '7890', DTR::EnvStore.new[:agent_listen_port]
+  end
+
+  def fork_and_kill_process
+    pid = fork_process do
+      loop do
+      end
+    end
+    kill_process pid
+    Timeout.timeout(1) do
+      Process.waitall
+    end
+  end
+end

data/test/unit/logger_test.rb

@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+require 'dtr/agent/sync_logger'
+require 'stringio'
+#logger related unit test, including sync_logger
+class LoggerTest < Test::Unit::TestCase
+  def setup
+    @msg = nil
+  end
+
+  def teardown
+    DTR.logger = DTR.create_default_logger(nil)
+  end
+
+  def test_should_not_send_message_when_message_logger_level_is_not_enough
+    DTR.logger = DTR::SyncLogger::MessageDecoratedLogger.new(self)
+    @msg = nil
+    DTR.debug('debug msg')
+    assert_nil @msg
+  end
+
+  def test_send_message
+    DTR.logger = DTR::SyncLogger::MessageDecoratedLogger.new(self)
+    DTR.info('info msg')
+    assert_equal "From #{Socket.gethostname}: info msg", @msg
+    DTR.info('error msg')
+    assert_equal "From #{Socket.gethostname}: error msg", @msg
+  end
+
+  def test_send_message_by_block_should_be_sent_as_string_msg
+    DTR.logger = DTR::SyncLogger::MessageDecoratedLogger.new(self)
+    DTR.info { 'info msg' }
+    assert_equal "From #{Socket.gethostname}: info msg", @msg
+  end
+
+  def test_should_output_error_into_stderr
+    logs = catch_stderr_output do
+      DTR.debug {'debug info'}
+      DTR.info {'info info'}
+      DTR.error {'error info'}
+    end
+    assert(/error info/ =~ logs)
+    assert(/info info/ !~ logs)
+    assert(/debug info/ !~ logs)
+  end
+
+  def catch_stderr_output
+    stderr = $stderr
+    $stderr = StringIO.new
+    yield
+    $stderr.rewind
+    $stderr.read
+  ensure
+    $stderr = stderr
+  end
+
+  def level
+    Logger::INFO
+  end
+
+  def debug(msg)
+    @msg = msg
+  end
+
+  def error(msg)
+    @msg = msg
+  end
+
+  def info(msg)
+    @msg = msg
+  end
+end

data/test/unit/test_unit_test.rb

@@ -13,33 +13,12 @@ class TestUnitTest < Test::Unit::TestCase
     assert Test::Unit::UI::TestRunnerMediator.respond_to?(:reject_dtr)
     assert Test::Unit::UI::TestRunnerMediator.method_defined?(:run_suite_without_dtr_injection)
     assert Test::Unit::UI::TestRunnerMediator.private_method_defined?(:create_result_without_thread_safe)
-    assert !Test::Unit::TestCase.respond_to?(:reject_dtr)
-    assert !Test::Unit::TestCase.method_defined?(:run_without_dtr_injection)
-  end
-
-  def test_inject_testcase
-    Test::Unit::TestCase.send(:include, DTR::TestUnit::TestCaseInjection)
-    begin
-      assert Test::Unit::TestCase.respond_to?(:reject_dtr)
-      assert Test::Unit::TestCase.method_defined?(:run_without_dtr_injection)
-    ensure
-      Test::Unit::TestCase.reject_dtr
-    end
-    assert !Test::Unit::TestCase.respond_to?(:reject_dtr)
-    assert !Test::Unit::TestCase.method_defined?(:run_without_dtr_injection)
   end
 
   def test_reject
     DTR.inject
     DTR.reject
-    test_case = Test::Unit::TestCase.new('name')
-    assert_false test_case.respond_to?(:run_without_dtr_injection)
-    assert test_case.respond_to?(:run)
-
-    assert !Test::Unit::TestCase.respond_to?(:reject_dtr)
     assert !Test::Unit::UI::TestRunnerMediator.respond_to?(:reject_dtr)
-
-    assert !Test::Unit::TestCase.method_defined?(:run_without_dtr_injection)
     assert !Test::Unit::UI::TestRunnerMediator.method_defined?(:run_suite_without_dtr_injection)
     assert !Test::Unit::UI::TestRunnerMediator.private_method_defined?(:create_result_without_thread_safe)
   end

data/testdata/Rakefile

@@ -5,11 +5,7 @@ require 'rake/testtask'
 desc "Default Task"
 task :default => :dtr
 
-DTR::TestTask.new :dtr do |t|
+DTR::TestTask.new do |t|
   t.test_files = FileList['*test_case.rb']
   t.processes = 2
 end
-
-DTR::PackageTask.new do |p|
-  p.package_files.include("**/*")
-end

data/testdata/hacked_run_method_test_case.rb

@@ -0,0 +1,15 @@
+require 'test/unit'
+
+class HackedRunMethodTestCase < Test::Unit::TestCase
+
+  alias_method :run_without_hack, :run
+  def run(*args, &block)
+    UDPSocket.open.bind('', 9999)
+    run_without_hack(*args, &block)
+  end
+
+  def test_succeeded
+  end
+
+end
+

data/testdata/raketasks/Rakefile

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
+require 'dtr/raketasks'
+DTR.group = 'dtr acceptance tests'
+DTR::TestTask.new do |t|
+  t.test_files = FileList['success_test_case.rb']
+  t.processes = 0
+end

data/testdata/raketasks/success_test_case.rb

@@ -0,0 +1,6 @@
+require 'test/unit'
+class SuccessTestCase < Test::Unit::TestCase
+  def test_succeeded
+    assert true
+  end
+end

data/testdata/sleep_3_secs_test_case.rb

@@ -0,0 +1,9 @@
+require 'test/unit'
+
+class Sleep3SecsTestCase < Test::Unit::TestCase
+
+  def test_sleep_3_sec
+    sleep(3)
+  end
+
+end

data/testdata/{should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process → verify_dir_pwd}/verify_dir_pwd_test_case.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 class VerifyDirPwdTestCase < Test::Unit::TestCase
 
   def test_should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process
-    assert_equal 'should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process', Dir.pwd.split('/').last
+    assert_equal 'verify_dir_pwd', Dir.pwd.split('/').last
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xli-dtr
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors: 
 - Li Xiao
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-10-09 00:00:00 -07:00
 default_executable: dtr
 dependencies: []
 
@@ -19,18 +19,23 @@ executables:
 - dtr
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
+- LICENSE.txt
+- TODO
+- CHANGES
 files: 
 - lib/dtr/agent/brain.rb
 - lib/dtr/agent/herald.rb
 - lib/dtr/agent/runner.rb
 - lib/dtr/agent/sync_codebase.rb
 - lib/dtr/agent/sync_logger.rb
+- lib/dtr/agent/test_case.rb
 - lib/dtr/agent/test_unit.rb
 - lib/dtr/agent/worker.rb
 - lib/dtr/agent/working_env_ext.rb
 - lib/dtr/agent.rb
+- lib/dtr/facade.rb
 - lib/dtr/master.rb
 - lib/dtr/monitor.rb
 - lib/dtr/raketasks.rb
@@ -44,7 +49,7 @@ files:
 - lib/dtr/shared/service/runner.rb
 - lib/dtr/shared/service/working_env.rb
 - lib/dtr/shared/service.rb
-- lib/dtr/shared/sync_codebase/codebase.rb
+- lib/dtr/shared/sync_codebase/copiable_package.rb
 - lib/dtr/shared/sync_codebase/master_ext.rb
 - lib/dtr/shared/sync_codebase/package.rb
 - lib/dtr/shared/sync_codebase/sync_service.rb
@@ -59,6 +64,7 @@ files:
 - lib/dtr/test_unit/drb_test_runner.rb
 - lib/dtr/test_unit/injection.rb
 - lib/dtr/test_unit/test_case_injection.rb
+- lib/dtr/test_unit/test_suite_injection.rb
 - lib/dtr/test_unit/testrunnermediator_injection.rb
 - lib/dtr/test_unit/thread_safe_test_result.rb
 - lib/dtr/test_unit/worker_club.rb
@@ -68,17 +74,22 @@ files:
 - bin/dtr
 - CHANGES
 - dtr.gemspec
-- install.rb
 - lib
 - LICENSE.TXT
 - Rakefile
-- README
+- README.rdoc
 - TODO
-has_rdoc: false
+- LICENSE.txt
+has_rdoc: true
 homepage: http://github.com/xli/dtr/tree/master
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --main
+- README.rdoc
+- --title
+- "\"DTR -- Distributed Test Runner"
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -104,12 +115,16 @@ test_files:
 - test/acceptance/agent_working_env_test.rb
 - test/acceptance/dtr_package_task_test.rb
 - test/acceptance/general_test.rb
+- test/acceptance/raketasks_test.rb
 - test/acceptance/sync_codebase_test.rb
 - test/acceptance/sync_logger_test.rb
 - test/agent_helper.rb
 - test/logger_stub.rb
 - test/test_helper.rb
 - test/unit/adapter_test.rb
+- test/unit/configuration_test.rb
+- test/unit/facade_test.rb
+- test/unit/logger_test.rb
 - test/unit/test_unit_test.rb
 - test/unit/working_env_test.rb
 - testdata/a_failed_test_case.rb
@@ -120,13 +135,18 @@ test_files:
 - testdata/another_project
 - testdata/another_project/passed_test_case.rb
 - testdata/another_project/Rakefile
+- testdata/hacked_run_method_test_case.rb
 - testdata/is_required_by_a_test.rb
 - testdata/lib
 - testdata/lib/lib_test_case.rb
 - testdata/package_task_test_rakefile
 - testdata/Rakefile
+- testdata/raketasks
+- testdata/raketasks/Rakefile
+- testdata/raketasks/success_test_case.rb
 - testdata/scenario_test_case.rb
 - testdata/setup_agent_env_test_case.rb
-- testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process
-- testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process/Rakefile
-- testdata/should_not_sync_codebase_and_setup_working_dir_when_agent_is_in_same_dir_with_master_process/verify_dir_pwd_test_case.rb
+- testdata/sleep_3_secs_test_case.rb
+- testdata/verify_dir_pwd
+- testdata/verify_dir_pwd/Rakefile
+- testdata/verify_dir_pwd/verify_dir_pwd_test_case.rb