diff options
| -rw-r--r-- | lib/test/unit.rb | 6 | ||||
| -rw-r--r-- | lib/test/unit/parallel.rb | 4 | ||||
| -rw-r--r-- | test/testunit/test_parallel.rb | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 4d6d6014d6..0304638a66 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -54,7 +54,7 @@ module Test @options = options @opts = @options = options if @options[:parallel] - @files = args + @files = args @args = orig_args end end @@ -81,7 +81,7 @@ module Test opts.on '-n', '--name PATTERN', "Filter test names on pattern." do |a| options[:filter] = a end - + opts.on '--jobs-status [TYPE]', "Show status of jobs every file; Disabled when --jobs isn't specified." do |type| options[:job_status] = true options[:job_status_type] = type.to_sym if type @@ -293,7 +293,7 @@ module Test end private - + def call_hook(id,*additional) @hooks[id] ||= [] @hooks[id].each{|hook| hook[self,additional] } diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb index 80dd4eae56..9296165ebb 100644 --- a/lib/test/unit/parallel.rb +++ b/lib/test/unit/parallel.rb @@ -6,7 +6,7 @@ module Test class << self undef autorun end - + alias orig_run_suite _run_suite undef _run_suite undef _run_suites @@ -91,7 +91,7 @@ module Test begin stdout.puts "bye" rescue Errno::EPIPE; end - exit + exit end end end diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb index 24e03be736..62b21fc27e 100644 --- a/test/testunit/test_parallel.rb +++ b/test/testunit/test_parallel.rb @@ -51,7 +51,7 @@ module TestParallel assert_match(/^ready/,@worker_out.gets) end end - + def test_accept_run_command_multiple_times timeout(10) do assert_match(/^ready/,@worker_out.gets) @@ -145,7 +145,7 @@ module TestParallel #def test_childs #end - + def test_should_run_all_without_any_leaks spawn_runner buf = timeout(10){@test_out.read} |