test/acceptance/general_test.rb in dtr-1.0.0 vs test/acceptance/general_test.rb in dtr-1.1.0

@@ -156,12 +156,12 @@
       assert_equal 0, @result.error_count
     end
   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']
       suite = Test::Unit::TestSuite.new('test_run_test_specified_by_load_path')
       suite << LibTestCase.suite
@@ -224,11 +224,11 @@
           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
+          with_agent_configuration do
             result = runit(suite)
             assert result.passed?
             assert_equal 3, result.run_count
           end
         end
@@ -252,10 +252,10 @@
     assert_equal 0, $?.exitstatus
     Process.waitpid @test_processes[3]
     assert_equal 0, $?.exitstatus
   ensure
     @test_processes.each do |pid|
-      DTR.kill_process pid
+      kill_process pid
     end
   end
 
   def test_run_test_case_hacked_run_method
     assert_fork_process_exits_ok do