dtr 1.0.0 → 1.1.0

data/lib/dtr/shared/sync_codebase/sync_service.rb

@@ -17,9 +17,10 @@ module DTR
     module SyncService
       include Package
       include Service::File
-      def sync_codebase
-        DTR.info("Start sync codebase, clean #{File.join(Dir.pwd, package_name)}")
-        FileUtils.rm_rf(File.join(Dir.pwd, package_name))
+
+      def sync_codebase(&block)
+        DTR.info("Start sync codebase, clean #{File.expand_path(Dir.pwd)}")
+        Dir.glob('*').each { |f| FileUtils.rm_rf(f) }
 
         DTR.info("Lookup codebase package file")
         package = lookup_file
@@ -27,7 +28,9 @@ module DTR
         File.open(package_copy_file, 'w') do |f|
           package.copy_into(f)
         end
-        do_work(unpackage_cmd)
+
+        block.call
+
         DTR.info("sync codebase finished, clean #{package_copy_file}")
         FileUtils.rm_f(package_copy_file)
       end

data/lib/dtr/shared/utils/cmd.rb

@@ -16,14 +16,16 @@ module DTR
   class CmdInterrupt < StandardError; end
 
   class Cmd
-    def self.execute(cmd)
+    def self.execute(cmd, options = {:error_output_log_level => :error})
       return true if cmd.nil? || cmd.empty?
       DTR.info {"Executing: #{cmd.inspect}"}
       output = %x[#{cmd} 2>&1]
       # don't put the following message into a block which maybe passed to remote process
       status = $?.exitstatus
       DTR.info {"Execution is done, status: #{status}"}
-      DTR.error "#{cmd.inspect} output:\n#{output}" if status != 0
+      if status != 0
+        DTR.send(options[:error_output_log_level], "#{cmd.inspect} output:\n#{output}")
+      end
       $?.exitstatus == 0
     end
   end

data/lib/dtr/shared/utils/env_store.rb

@@ -18,42 +18,34 @@ module DTR
   class EnvStore
     FILE_NAME = '.dtr_env_pstore' unless defined?(FILE_NAME)
 
-    def self.destroy
-      File.delete(FILE_NAME) if File.exist?(FILE_NAME)
+    def self.default_file
+      File.join(DTR.root || Dir.pwd, FILE_NAME)
+    end
+
+    def initialize(file=EnvStore.default_file)
+      @pstore = PStore.new(File.expand_path(file))
+    end
+
+    def destroy
+      File.delete(@pstore.path) if File.exist?(@pstore.path)
     end
 
     def [](key)
-      return nil unless File.exist?(FILE_NAME)
-      
-      repository = PStore.new(FILE_NAME)
-      repository.transaction(true) do
-        repository[key]
+      @pstore.transaction(true) do
+        @pstore[key]
       end
     end
 
     def []=(key, value)
-      repository = PStore.new(FILE_NAME)
-      repository.transaction do
-        repository[key] = value
+      @pstore.transaction do
+        @pstore[key] = value
       end
     end
     
     def <<(key_value)
       key, value = key_value
-      repository = PStore.new(FILE_NAME)
-      repository.transaction do
-        repository[key] = (repository[key] || []) << value
-      end
-    end
-    
-    def shift(key)
-      repository = PStore.new(FILE_NAME)
-      repository.transaction do
-        if array = repository[key]
-          array.shift
-          repository[key] = array
-        end
-      end
+      array_value = (self[key] || []) << value
+      self[key] = array_value
     end
   end
 

data/lib/dtr/shared/working_env.rb

@@ -34,5 +34,13 @@ module DTR
     def ==(obj)
       obj && obj[:identifier] == self[:identifier]
     end
+    
+    def method_missing(m, *args, &block)
+      if args.blank?
+        self[m]
+      else
+        super
+      end
+    end
   end
 end

data/lib/dtr/test_unit/drb_test_runner.rb

@@ -32,7 +32,7 @@ module DTR
       end
 
       def run_test_on(runner)
-        runner.run(@test, @result, &@progress_block)
+        runner.run(@test, @result.instance(runner), &@progress_block)
       rescue DRb::DRbConnError => e
         DTR.info {"#{cause.class.name}(#{cause.message}), rerun test: #{@test.name}"}
         DTR.debug { cause.backtrace.join("\n") }

data/lib/dtr/test_unit/thread_safe_test_result.rb

@@ -14,9 +14,7 @@
 
 module DTR
   module TestUnit
-    class ThreadSafeTestResult
-      include DRbUndumped
-
+    class SynchronizedTestResult
       def initialize(rs)
         @mutex = Mutex.new
         @rs = rs
@@ -34,5 +32,60 @@ module DTR
         end
       end
     end
+
+    class ThreadSafeTestResult < SynchronizedTestResult
+
+      class Pair
+        include DRbUndumped
+
+        def initialize(rs1, rs2)
+          @rs1 = rs1
+          @rs2 = rs2
+        end
+
+        def to_s
+          @rs1.to_s
+        end
+
+        def method_missing(method, *args, &block)
+          @rs1.send(method, *args, &block)
+          @rs2.send(method, *args, &block)
+        end
+      end
+
+      class RunnerTestResults
+
+        def initialize
+          @results = {}
+        end
+
+        def fetch(runner)
+          @results[runner_id(runner)] ||= SynchronizedTestResult.new(Test::Unit::TestResult.new)
+        end
+
+        def to_s
+          @results.sort_by{|runner_id, result| -result.run_count}.collect do |runner_id, result|
+            "#{runner_id} => #{result}"
+          end.join("\n")
+        end
+
+        def runner_id(runner)
+          runner.instance_variable_get('@uri').gsub(/^druby:\/\//, '')
+        end
+      end
+
+      def initialize(*args)
+        super
+        @results = RunnerTestResults.new
+      end
+
+      def instance(runner)
+        Pair.new(self, @results.fetch(runner))
+      end
+
+      def to_s
+        "#{@results}\n\n#{super}"
+      end
+    end
   end
 end

data/test/acceptance/dtr_package_task_test.rb

@@ -5,14 +5,14 @@ class DTRPackageTaskTest < Test::Unit::TestCase
   def test_package
     testdata_dir = File.expand_path(File.dirname(__FILE__) + '/../../testdata')
     Dir.chdir(testdata_dir) do
-      %x[rake --rakefile package_task_test_rakefile dtr_package]
+      %x[rake -q --rakefile package_task_test_rakefile dtr_package]
       assert File.exists?(testdata_dir + "/dtr_pkg/codebase-dump/a_test_case2.rb")
       assert File.exists?(testdata_dir + "/dtr_pkg/codebase-dump/lib/lib_test_case.rb")
       assert File.exists?(testdata_dir + "/dtr_pkg/codebase-dump/is_required_by_a_test.rb")
 
       assert File.exists?(testdata_dir + "/dtr_pkg/codebase-dump.zip")
 
-      %x[rake --rakefile package_task_test_rakefile dtr_clobber_package]
+      %x[rake -q --rakefile package_task_test_rakefile dtr_clobber_package]
 
       assert !File.exists?(testdata_dir + "/dtr_pkg/codebase-dump/a_test_case2.rb")
       assert !File.exists?(testdata_dir + "/dtr_pkg/codebase-dump/lib/lib_test_case.rb")
@@ -27,7 +27,7 @@ class DTRPackageTaskTest < Test::Unit::TestCase
   def test_should_not_include_dtr_pkg_dir
     testdata_dir = File.expand_path(File.dirname(__FILE__) + '/../../testdata')
     Dir.chdir(testdata_dir) do
-      %x[rake dtr_repackage]
+      %x[rake -q dtr_repackage]
       assert !File.exists?(testdata_dir + "/dtr_pkg/codebase-dump/dtr_pkg")
     end
   ensure

data/test/acceptance/general_test.rb

@@ -158,8 +158,8 @@ class GeneralTest < Test::Unit::TestCase
   end
 
   def test_run_test_specified_by_load_path
+    lib_path = File.expand_path(File.dirname(__FILE__) + '/../../testdata/lib')
     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']
@@ -226,7 +226,7 @@ class GeneralTest < Test::Unit::TestCase
           suite << ATestCase.suite
           suite << ATestCase2.suite
           suite << AFileSystemTestCase.suite
-          with_agent_helper_group do
+          with_agent_configuration do
             result = runit(suite)
             assert result.passed?
             assert_equal 3, result.run_count
@@ -254,7 +254,7 @@ class GeneralTest < Test::Unit::TestCase
     assert_equal 0, $?.exitstatus
   ensure
     @test_processes.each do |pid|
-      DTR.kill_process pid
+      kill_process pid
     end
   end
 

data/test/acceptance/rails_ext_test.rb

@@ -0,0 +1,86 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+include DTR::AgentHelper
+
+class RailsExtTest < Test::Unit::TestCase
+  
+  def setup
+    start_agents(:follower_listen_heartbeat_timeout => 15)
+  end
+
+  def teardown
+    stop_agents
+  end
+
+  def test_run_dtr_test_task_with_simple_sqlite_project
+    new_simple_project do |testdata|
+      assert_run_dtr_test_task_success_with(testdata)
+    end
+  end
+
+  def test_should_not_trigger_auto_preparing_database_when_setup_agent_env_command_specified
+    new_simple_project do |testdata|
+      assert_fork_process_exits_ok do
+        Dir.chdir(testdata) do
+          output = %x[rake dtr:test DTR_GROUP='#{DTR::AgentHelper::GROUP}' BROADCAST_IP=localhost DTR_AGENT_ENV_SETUP_CMD=ls]
+          expected = <<-OUTPUT
+5 tests, 0 assertions, 0 failures, 10 errors
+OUTPUT
+          assert_equal 1, $?.exitstatus
+          assert output.include?(expected), "#{output} should include #{expected}"
+        end
+      end
+    end
+  end
+
+  def test_run_dtr_test_task_with_mysql_database
+    new_simple_project do |testdata|
+      FileUtils.cp_r(testdata + "/config/database.yml.mysql", testdata + "/config/database.yml")
+      assert_run_dtr_test_task_success_with(testdata)
+      Dir.chdir(agent1_runner1_dir) do
+        assert File.exist?('created_by_database_yml_mysql')
+      end
+    end
+  end
+
+  def test_run_dtr_test_task_with_database_yml_dtr_specified
+    new_simple_project do |testdata|
+      FileUtils.cp_r(testdata + "/config/database.yml.mysql", testdata + "/config/database.yml.dtr")
+      assert_run_dtr_test_task_success_with(testdata)
+      Dir.chdir(agent1_runner1_dir) do
+        assert File.exist?('created_by_database_yml_mysql')
+      end
+    end
+  end
+
+  def assert_run_dtr_test_task_success_with(testdata)
+    assert_fork_process_exits_ok do
+      Dir.chdir(testdata) do
+        output = %x[rake dtr:test DTR_GROUP='#{DTR::AgentHelper::GROUP}' BROADCAST_IP=localhost]
+        expected = <<-OUTPUT
+5 tests, 7 assertions, 0 failures, 0 errors
+OUTPUT
+        assert_equal 0, $?.exitstatus
+        assert output.include?(expected), "should include #{expected}"
+      end
+    end
+  end
+
+  def new_simple_project
+    simple_project = File.expand_path(File.dirname(__FILE__) + '/../../testdata/rails_projects/simple_project')
+    testdata = File.expand_path(File.dirname(__FILE__) + '/rails_ext_test')
+    FileUtils.rm_rf(testdata)
+    FileUtils.cp_r(simple_project, testdata)
+
+    lib_dir = File.expand_path(File.dirname(__FILE__) + '/../../lib')
+    tasks_dir = File.expand_path(File.dirname(__FILE__) + '/../../tasks')
+    dtr_plugin_dir = testdata + '/vendor/plugins/dtr'
+    FileUtils.mkdir_p(dtr_plugin_dir)
+    FileUtils.cp_r(lib_dir, dtr_plugin_dir)
+    FileUtils.cp_r(tasks_dir, dtr_plugin_dir)
+
+    yield testdata
+  ensure
+    FileUtils.rm_rf(testdata)
+  end
+end

data/test/acceptance/raketasks_test.rb

@@ -20,4 +20,18 @@ OUTPUT
     stop_agents
     FileUtils.rm_rf("raketasks_test_agent")
   end
+
+  def test_test_task_with_processes
+    test_dir = File.expand_path(File.dirname(__FILE__) + '/../../testdata/raketasks')
+    Dir.chdir(test_dir) do
+      output = %x[rake dtr P=3]
+      expected = <<-OUTPUT
+1 tests, 1 assertions, 0 failures, 0 errors
+OUTPUT
+      assert_equal 0, $?.exitstatus
+      assert output.include?(expected), "should include #{expected}"
+    end
+  ensure
+    FileUtils.rm_rf("#{test_dir}/#{Socket.gethostname.gsub(/[^\d\w]/, '_')}")
+  end
 end

data/test/acceptance/sync_codebase_test.rb

@@ -9,8 +9,8 @@ class SyncCodebaseTest < Test::Unit::TestCase
     testdata_dir = File.expand_path(File.dirname(__FILE__) + '/../../testdata')
 
     master = Process.fork do
-      DTR.configuration.with_rinda_server do
-        Dir.chdir(testdata_dir) do
+      Dir.chdir(testdata_dir) do
+        DTR.configuration.with_rinda_server do
           DTR::Cmd.execute('rake dtr_repackage')
           provide_file DTR::SyncCodebase::CopiablePackage.new
           DRb.thread.join
@@ -20,10 +20,12 @@ class SyncCodebaseTest < Test::Unit::TestCase
     #sleep for waiting rinda server start
     sleep(1)
     client = Process.fork do
-      start_service
       Dir.mkdir("test_sync_codebase")
       Dir.chdir("test_sync_codebase") do
-        sync_codebase
+        start_service
+        sync_codebase do
+          do_work(unpackage_cmd)
+        end
       end
     end
     Process.waitpid client
@@ -31,36 +33,11 @@ class SyncCodebaseTest < Test::Unit::TestCase
     assert !File.exists?("test_sync_codebase/#{package_copy_file}")
   ensure
     stop_service rescue nil
-    DTR.kill_process master
-    DTR.kill_process client
+    kill_process master
+    kill_process client
     FileUtils.rm_rf("test_sync_codebase")
     Dir.chdir(testdata_dir) do
       DTR::Cmd.execute('rake dtr_clobber_package')
     end
   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/verify_dir_pwd')
-    @agent = start_agent_at @master_dir, 2, false
-    begin
-      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?
-          assert_equal 1, result.run_count
-        end
-      end
-    ensure
-      DTR.kill_process @agent
-      Process.waitall
-    end
-  end
-
 end

data/test/acceptance/sync_logger_test.rb

@@ -5,7 +5,7 @@ include DTR::AgentHelper
 class SyncLoggerTest < Test::Unit::TestCase
   
   def setup
-    start_agents
+    start_agents(:size => 1)
   end
 
   def teardown
@@ -13,8 +13,8 @@ class SyncLoggerTest < Test::Unit::TestCase
   end
 
   def test_master_process_should_get_log_of_agents
+    @logger = LoggerStub.new
     assert_fork_process_exits_ok do
-      @logger = LoggerStub.new
       DTR.logger = @logger
 
       $argv_dup = ['a_test_case.rb']
@@ -23,10 +23,13 @@ class SyncLoggerTest < Test::Unit::TestCase
       runit(suite)
 
       logs = @logger.logs.flatten.join("\n")
-      assert(/From #{Socket.gethostname}: => Herald starts off\.\.\./ =~ logs)
+      # puts logs
+      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
+  ensure
+    @logger.clear
   end
 end