xli-dtr 0.0.5 → 1.0.0

data/lib/dtr/shared/sync_codebase.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.
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 require 'dtr/shared/sync_codebase/package'
-require 'dtr/shared/sync_codebase/codebase'
+require 'dtr/shared/sync_codebase/copiable_package'
 require 'dtr/shared/sync_codebase/sync_service'
 require 'dtr/shared/sync_codebase/master_ext'

data/lib/dtr/shared/sync_logger.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.
@@ -18,22 +18,21 @@ module DTR
   module SyncLogger
     class UndumpedLogger
       include DRbUndumped
-      include MessageDecorator
 
       def initialize(logger)
         @logger = logger
       end
 
       def debug(message=nil, &block)
-        with_decorating_message(:debug, message, &block)
+        @logger.send(:debug, message, &block)
       end
 
       def info(message=nil, &block)
-        with_decorating_message(:info, message, &block)
+        @logger.send(:info, message, &block)
       end
 
       def error(message=nil, &block)
-        with_decorating_message(:error, message, &block)
+        @logger.send(:error, message, &block)
       end
 
       def datetime_format=(format)
@@ -44,15 +43,8 @@ module DTR
         @logger.level = level
       end
 
-      private
-      def with_decorating_message(level, msg, &block)
-        if block_given?
-          @logger.send(level) do
-            decorate_message(block.call)
-          end
-        else
-          @logger.send(level, decorate_message(msg))
-        end
+      def level
+        @logger.level
       end
     end
 

data/lib/dtr/shared/utils/cmd.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.
@@ -18,12 +18,12 @@ module DTR
   class Cmd
     def self.execute(cmd)
       return true if cmd.nil? || cmd.empty?
-      DTR.info "Executing: #{cmd.inspect}"
+      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
-      # and no $?  could be found
-      DTR.info "Execution is done, status: #{$?.exitstatus}"
-      DTR.error "#{cmd.inspect} output:\n#{output}" if $?.exitstatus != 0
+      status = $?.exitstatus
+      DTR.info {"Execution is done, status: #{status}"}
+      DTR.error "#{cmd.inspect} output:\n#{output}" if status != 0
       $?.exitstatus == 0
     end
   end

data/lib/dtr/shared/utils/env_store.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.

data/lib/dtr/shared/utils/logger.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.
@@ -13,9 +13,26 @@
 # limitations under the License.
 
 require 'logger'
+require 'fileutils'
 
 module DTR
   module LoggerExt
+    DATETIME_FORMAT = "%m-%d %H:%M:%S"
+
+    LOGGER_LEVEL = {:info => Logger::INFO, :error => Logger::ERROR, :debug => Logger::DEBUG}
+
+    module OutputErrorIntoConsole
+      def self.included(base)
+        base.alias_method_chain :error, :output_into_console
+      end
+
+      def error_with_output_into_console(message = nil, &block)
+        $stderr.puts "\n" + format_message(format_severity(Logger::ERROR), Time.now, nil, message || block.call)
+        error_without_output_into_console(message, &block)
+      end
+    end
+    Logger.send(:include, OutputErrorIntoConsole)
+
     def logger(file=nil)
       @logger ||= create_default_logger(file)
     end
@@ -24,12 +41,13 @@ module DTR
       @logger = logger
     end
 
-    def create_default_logger(file=nil)
-      dir = File.exist?('log') ? 'log' : '/tmp'
-      log_file = File.join(dir,  file || "dtr.log")
-      do_print "dtr logfile at #{log_file}\n"
+    def create_default_logger(file)
+      dir = 'log'
+      FileUtils.mkdir_p(dir)
+      log_file = File.join(dir,  file || 'dtr.log')
+      do_println "DTR logfile at #{Dir.pwd}/#{log_file}"
       logger = Logger.new(log_file, 1, 5*1024*1024)
-      logger.datetime_format = "%m-%d %H:%M:%S"
+      logger.datetime_format = DATETIME_FORMAT
       logger.level = (ENV['DTR_LOG_LEVEL'] || Logger::INFO).to_i
       logger
     end
@@ -40,6 +58,10 @@ module DTR
       end
     end
 
+    def do_println(str)
+      do_print("#{str}\n")
+    end
+
     def debug(message=nil, &block)
       output(:debug, message, &block)
     end
@@ -53,17 +75,11 @@ module DTR
     end
 
     def output(level, msg=nil, &block)
-      logger.send(level) do
-        message = block_given? ? block.call : msg.to_s
-        # puts "log: #{message}"
-
-        #output message when it's an error for agent error log should be displayed in console
-        if level == :error
-          $stderr.puts ''
-          $stderr.puts "#{Time.now}: #{message}"
-        end
-        message
-      end
+      return if LOGGER_LEVEL[level] < logger.level
+
+      msg = block.call if block_given?
+      # puts "log: #{msg}"
+      logger.send(level, msg)
     end
   end
 

data/lib/dtr/shared/utils.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.

data/lib/dtr/shared/working_env.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.
@@ -15,7 +15,7 @@
 module DTR
   class WorkingEnv
     def initialize
-      files = (defined?($argv_dup) ? $argv_dup : []).dup
+      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
 

data/lib/dtr/shared.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.

data/lib/dtr/test_unit/drb_test_runner.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,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'timeout'
-
 module DTR
   module TestUnit
     class DRbTestRunner
@@ -33,18 +31,11 @@ module DTR
         end
       end
 
-      def run_test_on(runner, timeout)
-        Timeout.timeout(timeout) do
-          runner.run(@test, @result, &@progress_block)
-        end
-      rescue Timeout::Error => e
-        DTR.info {"Run test timeout(#{timeout}), reboot runner"}
-        runner.reboot rescue nil
-        DTR.info {"rerun test: #{@test.name}"}
-        self.run
+      def run_test_on(runner)
+        runner.run(@test, @result, &@progress_block)
       rescue DRb::DRbConnError => e
-        DTR.info {"DRb::DRbConnError(#{e.message}), rerun test: #{@test.name}"}
-        DTR.debug { e.backtrace.join("\n") }
+        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." }

data/lib/dtr/test_unit/injection.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,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'test/unit/testcase'
 require 'test/unit/ui/testrunnermediator'
 
 module DTR

data/lib/dtr/test_unit/test_case_injection.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.
@@ -15,22 +15,22 @@
 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 self.included(base)
-        base.alias_method_chain :run, :dtr_injection
-        #have to use class_eval for adding it back after removed reject_dtr method
-        base.class_eval do
-          def self.reject_dtr
-            remove_method :run
-            alias_method :run, :run_without_dtr_injection
-            remove_method :run_without_dtr_injection
-            (class << self; self; end;).send :remove_method, :reject_dtr
-          end
+        def size
+          @test.size
         end
       end
 
-      def run_with_dtr_injection(result, &progress_block)
-        DRbTestRunner.new(self, result, &progress_block).run
+      def proxy
+        Proxy.new(self)
       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

data/lib/dtr/test_unit/testrunnermediator_injection.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,18 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'test/unit/testcase'
+require 'test/unit/testsuite'
+
 module DTR
   module TestUnit
     module TestRunnerMediatorInjection
-
       class SuiteWrapper
         def initialize(suite)
           @suite = suite
         end
+
         def run(result, &block)
           @suite.run(result, &block)
           WorkerClub.instance.graceful_shutdown
         end
+
         def size
           @suite.size
         end
@@ -55,16 +59,12 @@ module DTR
 
       def run_suite_with_dtr_injection
         DTR.logger('dtr_master_process.log')
-        @suite = SuiteWrapper.new(@suite)
+        # inject testcase&testsuite as late as possible, for it's too easy to be hacked in ruby world
+        Test::Unit::TestCase.send(:include, TestUnit::TestCaseInjection)
+        Test::Unit::TestSuite.send(:include, TestUnit::TestSuiteInjection)
+        @suite = SuiteWrapper.new(@suite.proxy)
         with_dtr_master do
-          # inject testcase as late as possible, for in ruby world there is lots hacks added to TestCase#run method,
-          # DTR should be the last one to add dtr injection chain into run method
-          Test::Unit::TestCase.send(:include, TestUnit::TestCaseInjection)
-          begin
-            run_suite_without_dtr_injection
-          ensure
-            Test::Unit::TestCase.reject_dtr
-          end
+          run_suite_without_dtr_injection
         end
       end
     end

data/lib/dtr/test_unit/thread_safe_test_result.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,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'drb'
-
 module DTR
   module TestUnit
     class ThreadSafeTestResult

data/lib/dtr/test_unit/worker_club.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.
@@ -23,7 +23,7 @@ module DTR
 
       def start_thread(drb_runner, remote_runner)
         thread = Thread.new(drb_runner, remote_runner) do |local, remote|
-          local.run_test_on(remote, timeout)
+          local.run_test_on(remote)
         end
         thread[:started_on] = Time.now
         workers.add(thread)
@@ -33,16 +33,16 @@ module DTR
       # too long. It waits by ENV['RUN_TEST_TIMEOUT'] || 60 seconds
       def graceful_shutdown
         while reap_dead_workers("shutdown") > 0
-          DTR.info "Waiting for #{workers.list.length} threads to finish, could take #{timeout} seconds."
+          DTR.info {"Waiting for #{workers.list.length} threads to finish, could take #{timeout} seconds."}
           sleep timeout / 60
         end
       end
 
+      private
       def timeout
-        ENV['RUN_TEST_TIMEOUT'] || DEFAULT_RUN_TEST_TIMEOUT
+        (ENV['RUN_TEST_TIMEOUT'] || DEFAULT_RUN_TEST_TIMEOUT).to_i
       end
 
-      private
       def workers
         @workers ||= ThreadGroup.new
       end
@@ -52,14 +52,14 @@ module DTR
       # after the reap is done. It only runs if there are workers to reap.
       def reap_dead_workers(reason='unknown')
         if workers.list.length > 0
-          DTR.info "Reaping #{workers.list.length} threads because of '#{reason}'"
+          DTR.info {"Reaping #{workers.list.length} threads because of '#{reason}'"}
           error_msg = "#{Time.now}: WorkerClub timed out this thread: #{reason}"
           mark = Time.now
           workers.list.each do |worker|
             worker[:started_on] = Time.now if not worker[:started_on]
 
             if mark - worker[:started_on] > timeout
-              DTR.info "Thread #{worker.inspect} is too old, killing."
+              DTR.info {"Thread #{worker.inspect} is too old, killing."}
               worker.raise(TimeoutError.new(error_msg))
             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.
@@ -18,5 +18,6 @@ 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_injection.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.

data/lib/dtr.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,42 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DTRVERSION="0.0.5"
+require 'dtr/facade'
+
+DTRVERSION="1.0.0"
 DTR_AGENT_OPTIONS = {:runners => [], :agent_env_setup_cmd => nil}
 
 module DTR
-
-  def start_agent
-    launch_agent(DTR_AGENT_OPTIONS[:runners], DTR_AGENT_OPTIONS[:agent_env_setup_cmd])
-  end
-
-  def launch_agent(names, setup=nil)
-    require 'dtr/agent'
-    names = names || "DTR(#{Time.now})"
-    DTR::Agent.start(names, setup)
-  end
-
-  def lib_path
-    File.expand_path(File.dirname(__FILE__))
-  end
-
-  def broadcast_list=(list)
-    require 'dtr/shared'
-    DTR.configuration.broadcast_list = list
-    DTR.configuration.save
-  end
-
-  def port=(port)
-    require 'dtr/shared'
-    DTR.configuration.rinda_server_port = port
-    DTR.configuration.save
-  end
-
-  def monitor
-    require 'dtr/monitor'
-    DTR.logger('dtr_monitor.log')
-    Monitor.new.start
-  end
-
-  module_function :start_agent, :launch_agent, :lib_path, :broadcast_list=, :monitor, :port=
+  extend Facade
 end

data/test/acceptance/agent_working_env_test.rb

@@ -7,40 +7,34 @@ class AgentWorkingEnvTest < Test::Unit::TestCase
   def setup
     #start_agents first for test files loaded would be copied into sub processes
     start_agents
-    DTR.inject
   end
 
   def teardown
-    DTR.reject
     stop_agents
-    $argv_dup = nil
   end
 
   def test_run_2_project_should_be_independence
-    Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/../../testdata/")) do
+    assert_fork_process_exits_ok do
       $argv_dup = ['an_error_test_case.rb']
-      require 'an_error_test_case'
 
       suite = Test::Unit::TestSuite.new('test_run_2_project_should_be_independence 1')
       suite << AnErrorTestCase.suite
 
-      assert_fork_process_exits_ok do
-        @result = runit(suite)
+      @result = runit(suite)
 
-        assert_false @result.passed?
-        assert_equal 1, @result.run_count
-        assert_equal 0, @result.failure_count
-        assert_equal 1, @result.error_count
-      end
+      assert_false @result.passed?
+      assert_equal 1, @result.run_count
+      assert_equal 0, @result.failure_count
+      assert_equal 1, @result.error_count
     end
 
-    Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/../../testdata/another_project")) do
-      $argv_dup = ['passed_test_case.rb']
-      require 'passed_test_case'
-      suite = Test::Unit::TestSuite.new('test_run_2_project_should_be_independence 2')
-      suite << PassedTestCase.suite
+    assert_fork_process_exits_ok do
+      Dir.chdir("another_project") do
+        $argv_dup = ['passed_test_case.rb']
+        require 'passed_test_case'
+        suite = Test::Unit::TestSuite.new('test_run_2_project_should_be_independence 2')
+        suite << PassedTestCase.suite
 
-      assert_fork_process_exits_ok do
         @result = runit(suite)
 
         assert @result.passed?
@@ -52,13 +46,13 @@ class AgentWorkingEnvTest < Test::Unit::TestCase
   end
 
   def test_run_same_project_twice_should_be_independence
-    Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/../../testdata/another_project")) do
-      $argv_dup = ['passed_test_case.rb']
-      require 'passed_test_case'
-      suite = Test::Unit::TestSuite.new('test_run_same_project_twice_should_be_independence 1')
-      suite << PassedTestCase.suite
+    assert_fork_process_exits_ok do
+      Dir.chdir("another_project") do
+        $argv_dup = ['passed_test_case.rb']
+        require 'passed_test_case'
+        suite = Test::Unit::TestSuite.new('test_run_same_project_twice_should_be_independence 1')
+        suite << PassedTestCase.suite
 
-      assert_fork_process_exits_ok do
         @result = runit(suite)
 
         assert @result.passed?
@@ -68,24 +62,24 @@ class AgentWorkingEnvTest < Test::Unit::TestCase
       end
     end
 
-    Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/../../testdata/another_project")) do
-      FileUtils.cp("./../an_error_test_case.rb", '.')
-      begin
-        $argv_dup = ['an_error_test_case.rb']
-        require 'an_error_test_case'
-        suite = Test::Unit::TestSuite.new('test_run_same_project_twice_should_be_independence 2')
-        suite << AnErrorTestCase.suite
+    assert_fork_process_exits_ok do
+      Dir.chdir("another_project") do
+        FileUtils.cp("./../an_error_test_case.rb", '.')
+        begin
+          $argv_dup = ['an_error_test_case.rb']
+          require 'an_error_test_case'
+          suite = Test::Unit::TestSuite.new('test_run_same_project_twice_should_be_independence 2')
+          suite << AnErrorTestCase.suite
 
-        assert_fork_process_exits_ok do
           @result = runit(suite)
 
           assert_false @result.passed?
           assert_equal 1, @result.run_count
           assert_equal 0, @result.failure_count
           assert_equal 1, @result.error_count
+        ensure
+          FileUtils.rm_f('an_error_test_case.rb')
         end
-      ensure
-        FileUtils.rm_f('an_error_test_case.rb')
       end
     end
   end

data/test/acceptance/dtr_package_task_test.rb

@@ -10,7 +10,7 @@ class DTRPackageTaskTest < Test::Unit::TestCase
       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.tar.bz2")
+      assert File.exists?(testdata_dir + "/dtr_pkg/codebase-dump.zip")
 
       %x[rake --rakefile package_task_test_rakefile dtr_clobber_package]
 
@@ -18,9 +18,19 @@ class DTRPackageTaskTest < Test::Unit::TestCase
       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.tar.bz2")
+      assert !File.exists?(testdata_dir + "/dtr_pkg/codebase-dump.zip")
     end
   ensure
     FileUtils.rm_rf(testdata_dir + "/dtr_pkg") rescue nil
   end
-end
+
+  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]
+      assert !File.exists?(testdata_dir + "/dtr_pkg/codebase-dump/dtr_pkg")
+    end
+  ensure
+    FileUtils.rm_rf(testdata_dir + "/dtr_pkg") rescue nil
+  end
+end