lib/testjour/progressbar.rb @@ -55,7 +55,7 @@ module Testjour def print_results puts - puts "Building on #{@found_server} processes..." + puts "Requesting build from #{@found_server} processes..." puts Cucumber::CLI.executor.wait_for_results lib/testjour/commands/run.rb @@ -7,19 +7,19 @@ module Testjour end def step_passed(step, regexp, args) - @queue_server.write_result "." + @queue_server.write_result DRb.uri, "." end def step_failed(step, regexp, args) - @queue_server.write_result "F", step.error.message, step.error.backtrace + @queue_server.write_result DRb.uri, "F", step.error.message, step.error.backtrace end def step_pending(step, regexp, args) - @queue_server.write_result "P" + @queue_server.write_result DRb.uri, "P" end def step_skipped(step, regexp, args) - @queue_server.write_result "_" + @queue_server.write_result DRb.uri, "_" end def method_missing(*args, &block) lib/testjour/cucumber_extensions/drb_formatter.rb @@ -1,6 +1,5 @@ require "testjour/colorer" - -require File.expand_path(File.dirname(__FILE__) + "/../../../vendor/progressbar") +require "testjour/progressbar" module Testjour @@ -18,21 +17,22 @@ module Testjour @passed = 0 @skipped = 0 @pending = 0 + @result_uris = [] @errors = [] end def wait_for_results - progress_bar = ProgressBar.new("running", step_count) + progress_bar = ProgressBar.new("0 slaves", step_count) step_count.times do log_result(*@queue_server.take_result) if failed? progress_bar.colorer = Testjour::Colorer.method(:failed).to_proc - progress_bar.title = "#{@errors.size} failed" + progress_bar.title = "#{@result_uris.size} slaves, #{@errors.size} failures" else progress_bar.colorer = Testjour::Colorer.method(:passed).to_proc - progress_bar.title = "running" + progress_bar.title = "#{@result_uris.size} slaves" end progress_bar.inc @@ -49,7 +49,10 @@ module Testjour end - def log_result(dot, message, backtrace) + def log_result(uri, dot, message, backtrace) + @result_uris << uri + @result_uris.uniq! + case dot when "." @passed += 1 lib/testjour/cucumber_extensions/queueing_executor.rb @@ -48,8 +48,8 @@ module Testjour end end - def write_result(dot, message = nil, backtrace = []) - @result_queue.push [dot, message.to_s, backtrace.join("\n")] + def write_result(uri, dot, message = nil, backtrace = []) + @result_queue.push [uri, dot, message.to_s, backtrace.join("\n")] nil end lib/testjour/queue_server.rb @@ -6,12 +6,12 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Bryan Helmkamp"] - s.date = %q{2008-12-08} + s.date = %q{2008-12-09} s.default_executable = %q{testjour} s.description = %q{Distributed test running with autodiscovery via Bonjour (for Cucumber first)} s.email = %q{bryan@brynary.com} s.executables = ["testjour"] - s.files = ["History.txt", "MIT-LICENSE.txt", "README.rdoc", "Rakefile", "bin/testjour", "lib/testjour", "lib/testjour/bonjour.rb", "lib/testjour/cli.rb", "lib/testjour/colorer.rb", "lib/testjour/commands", "lib/testjour/commands/base_command.rb", "lib/testjour/commands/help.rb", "lib/testjour/commands/list.rb", "lib/testjour/commands/local_run.rb", "lib/testjour/commands/run.rb", "lib/testjour/commands/slave_run.rb", "lib/testjour/commands/slave_start.rb", "lib/testjour/commands/slave_stop.rb", "lib/testjour/commands/slave_warm.rb", "lib/testjour/commands/version.rb", "lib/testjour/commands/warm.rb", "lib/testjour/commands.rb", "lib/testjour/cucumber_extensions", "lib/testjour/cucumber_extensions/drb_formatter.rb", "lib/testjour/cucumber_extensions/queueing_executor.rb", "lib/testjour/mysql.rb", "lib/testjour/pid_file.rb", "lib/testjour/queue_server.rb", "lib/testjour/rsync.rb", "lib/testjour/slave_server.rb", "lib/testjour.rb", "vendor/authprogs", "vendor/progressbar.rb"] + s.files = ["History.txt", "MIT-LICENSE.txt", "README.rdoc", "Rakefile", "bin/testjour", "lib/testjour", "lib/testjour/bonjour.rb", "lib/testjour/cli.rb", "lib/testjour/colorer.rb", "lib/testjour/commands", "lib/testjour/commands/base_command.rb", "lib/testjour/commands/help.rb", "lib/testjour/commands/list.rb", "lib/testjour/commands/local_run.rb", "lib/testjour/commands/run.rb", "lib/testjour/commands/slave_run.rb", "lib/testjour/commands/slave_start.rb", "lib/testjour/commands/slave_stop.rb", "lib/testjour/commands/slave_warm.rb", "lib/testjour/commands/version.rb", "lib/testjour/commands/warm.rb", "lib/testjour/commands.rb", "lib/testjour/cucumber_extensions", "lib/testjour/cucumber_extensions/drb_formatter.rb", "lib/testjour/cucumber_extensions/queueing_executor.rb", "lib/testjour/mysql.rb", "lib/testjour/pid_file.rb", "lib/testjour/progressbar.rb", "lib/testjour/queue_server.rb", "lib/testjour/rsync.rb", "lib/testjour/slave_server.rb", "lib/testjour.rb", "vendor/authprogs"] s.homepage = %q{http://github.com/brynary/testjour} s.require_paths = ["lib"] s.rubygems_version = %q{1.3.1} testjour.gemspec vendor/progressbar.rb 93c71027cc9034bf1ddcb54bb453e58e3036a496 Bryan Helmkamp bryan@brynary.com http://github.com/brynary/testjour/commit/facf5679def32c63539a50b6339d974821af0432 facf5679def32c63539a50b6339d974821af0432 2008-12-09T11:07:10-08:00 2008-12-09T10:48:05-08:00 Pass DRb uri to results 1d5876d1c762cabd7512eed7ee9a139bb2eda792 Bryan Helmkamp bryan@brynary.com