testbot 0.6.2 → 0.6.3

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.6.3
+
+Results are now shown as they happen. It takes care not to break escape codes used for
+coloring output (only tested with rspec, add a script/spec file containing "rspec --tty $@").
+
+Also, you can add a "logging: true" option to testbot.yml to see when files are synced, etc.
+
 0.6.2
 
 Fixed "invalid byte sequence in UTF-8" errors cased by test output in some cases.

data/README.markdown

@@ -64,7 +64,7 @@ Using testbot with Rails 2:
 
     # Add testbot to your Gemfile if you use bundler. You also need the plugin because
     # Rails 2 does not load raketasks from gems.
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.6.2'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.6.3'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)
@@ -108,6 +108,7 @@ Features
 * You can access your testbot network through SSH by using the built in SSH tunneling code.
 * You can use the same testbot network with multiple projects.
 * You can abort a test run with ctrl+c and all remote processes will be stopped.
+* It shows you the output as it happens.
 * Testbot is continuously tested for compatibility with Ruby 1.8.7 and 1.9.2.
 
 Contributing to testbot

data/lib/generators/testbot/templates/testbot.yml.erb

@@ -40,3 +40,6 @@ ssh_tunnel: true
 # every available instance or higher to create more
 # jobs than there are instances.
 available_runner_usage: 100%
+
+# Enable more logging from the requester
+# logging: true

data/lib/requester/requester.rb

@@ -30,36 +30,45 @@ module Testbot::Requester
     end
 
     def run_tests(adapter, dir)
-      puts if config.simple_output
+      puts if config.simple_output || config.logging
 
       if config.ssh_tunnel
-        SSHTunnel.new(config.server_host, config.server_user, adapter.requester_port).open
+        log "Setting up ssh tunnel" do
+          SSHTunnel.new(config.server_host, config.server_user, adapter.requester_port).open
+        end
         server_uri = "http://127.0.0.1:#{adapter.requester_port}"
       else
         server_uri = "http://#{config.server_host}:#{Testbot::SERVER_PORT}"
       end
 
-      rsync_ignores = config.rsync_ignores.to_s.split.map { |pattern| "--exclude='#{pattern}'" }.join(' ')
-      system "rsync -az --delete -e ssh #{rsync_ignores} . #{rsync_uri}"
+      log "Syncing files" do
+        rsync_ignores = config.rsync_ignores.to_s.split.map { |pattern| "--exclude='#{pattern}'" }.join(' ')
+        system "rsync -az --delete -e ssh #{rsync_ignores} . #{rsync_uri}"
+      end
 
       files = adapter.test_files(dir) 
       sizes = adapter.get_sizes(files)
 
-      build_id = HTTParty.post("#{server_uri}/builds", :body => { :root => root,
-                               :type => adapter.type.to_s,
-                               :project => config.project,
-                               :available_runner_usage => config.available_runner_usage,
-                               :files => files.join(' '),
-                               :sizes => sizes.join(' '),
-                               :jruby => jruby? })
+      build_id = nil
+      log "Requesting run" do
+        build_id = HTTParty.post("#{server_uri}/builds", :body => { :root => root,
+                                 :type => adapter.type.to_s,
+                                 :project => config.project,
+                                 :available_runner_usage => config.available_runner_usage,
+                                 :files => files.join(' '),
+                                 :sizes => sizes.join(' '),
+                                 :jruby => jruby? })
+      end
 
       trap("SIGINT") {  HTTParty.delete("#{server_uri}/builds/#{build_id}"); return false }
 
+      puts if config.logging
+
       last_results_size = 0
       success = true
       error_count = 0
       while true
-        sleep 1
+        sleep 0.5
 
         begin
           @build = HTTParty.get("#{server_uri}/builds/#{build_id}", :format => :json)
@@ -79,7 +88,8 @@ module Testbot::Requester
             print results.gsub(/[^\.F]|Finished/, '')
             STDOUT.flush
           else
-            puts results
+            print results
+            STDOUT.flush
           end
         end
 
@@ -103,6 +113,16 @@ module Testbot::Requester
 
     private
 
+    def log(text)
+      if config.logging
+        print "#{text}... "; STDOUT.flush
+        yield
+        puts "done"
+      else
+        yield
+      end
+    end
+
     def root
       if localhost?
         config.rsync_path

data/lib/runner/job.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'runner.rb'))
-require 'iconv'
+require File.expand_path(File.join(File.dirname(__FILE__), 'safe_result_text.rb'))
 
 module Testbot::Runner
   class Job
@@ -26,7 +26,7 @@ module Testbot::Runner
         result += run_and_return_result("#{base_environment} #{adapter.command(@project, ruby_cmd, @files)}")
       end
 
-      Server.put("/jobs/#{@id}", :body => { :result => strip_invalid_utf8(result), :success => success?, :time => run_time })
+      Server.put("/jobs/#{@id}", :body => { :result => SafeResultText.clean(result), :status => status, :time => run_time })
       puts "Job #{@id} finished."
     end
 
@@ -40,10 +40,8 @@ module Testbot::Runner
 
     private
 
-    def strip_invalid_utf8(text)
-      # http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/
-      ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
-      ic.iconv(text + ' ')[0..-2]
+    def status
+      success? ? "successful" : "failed"
     end
 
     def measure_run_time
@@ -52,9 +50,22 @@ module Testbot::Runner
       (Time.now - start_time) * 100
     end
 
+    def post_results(output)
+      Server.put("/jobs/#{@id}", :body => { :result => SafeResultText.clean(output), :status => "building" })
+    end
+
     def run_and_return_result(command)
       @test_process = open("|#{command} 2>&1", 'r')
-      output = @test_process.read
+      output = ""
+      t = Time.now
+      while char = @test_process.getc
+        char = (char.is_a?(Fixnum) ? char.chr : char) # 1.8 <-> 1.9
+        output << char
+        if Time.now - t > 0.5
+          post_results(output)
+          t = Time.now
+        end
+      end
       @test_process.close
       output
     end

data/lib/runner/safe_result_text.rb

@@ -0,0 +1,29 @@
+require 'iconv'
+
+module Testbot::Runner
+  class SafeResultText
+    def self.clean(text)
+      clean_escape_sequences(strip_invalid_utf8(text))
+    end
+
+    def self.strip_invalid_utf8(text)
+      # http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/
+      ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
+      ic.iconv(text + ' ')[0..-2]
+    end
+
+    def self.clean_escape_sequences(text)
+      tail_marker = "^[[0m"
+      tail = text.rindex(tail_marker) && text[text.rindex(tail_marker)+tail_marker.length..-1]
+      if !tail
+        text
+      elsif tail.include?("^[[") && !tail.include?("m")
+        text[0..text.rindex(tail_marker) + tail_marker.length - 1]
+      elsif text.scan(/\[.*?m/).last != tail_marker
+        text[0..text.rindex(tail_marker) + tail_marker.length - 1]
+      else
+        text
+      end
+    end
+  end
+end

data/lib/server/job.rb

@@ -5,11 +5,11 @@ module Testbot::Server
     def update(hash)
       super(hash)
       if self.build
-        done = !Job.all.find { |j| !j.result && j.build == self.build }
-        self.build.update(:results => build.results.to_s + self.result.to_s,
-                          :done => done)
+        self.done = done?
+        done = !Job.all.find { |j| !j.done && j.build == self.build }
+        self.build.update(:results => build_results(build), :done => done)
 
-        build_broken_by_job = (self.success == "false" && build.success)
+        build_broken_by_job = (self.status == "failed" && build.success)
         self.build.update(:success => false) if build_broken_by_job
       end
     end
@@ -23,6 +23,24 @@ module Testbot::Server
 
     private
 
+    def build_results(build)
+      self.last_result_position ||= 0
+      new_results = self.result.to_s[self.last_result_position..-1]
+      self.last_result_position = self.result.to_s.size
+
+      # Don't know why this is needed as the job should cleanup
+      # escape sequences.
+      if new_results[0,4] == '[32m'
+        new_results = new_results[4..-1]
+      end
+
+      build.results.to_s + new_results 
+    end
+
+    def done?
+      self.status == "successful" || self.status == "failed"
+    end
+
     def self.next_job(build_id, no_jruby)
       release_jobs_taken_by_missing_runners!
       jobs = Job.all.find_all { |j|

data/lib/server/server.rb

@@ -48,7 +48,7 @@ module Testbot::Server
   end
 
   put '/jobs/:id' do
-    Job.find(params[:id]).update(:result => params[:result], :success => params[:success]); nil
+    Job.find(params[:id]).update(:result => params[:result], :status => params[:status]); nil
   end
 
   get '/runners/ping' do

data/lib/shared/version.rb

@@ -1,7 +1,7 @@
 module Testbot
   # Don't forget to update readme and changelog
   def self.version
-    version = "0.6.2"
+    version = "0.6.3"
     dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
     if File.exists?(dev_version_file)
       version += File.read(dev_version_file)

data/test/requester/requester_test.rb

@@ -19,6 +19,7 @@ module Testbot::Requester
       flexmock(requester).should_receive(:find_tests).and_return([])
       flexmock(HTTParty).should_receive(:post).and_return('5')
       flexmock(requester).should_receive(:sleep).once
+      flexmock(requester).should_receive(:print).once
       flexmock(requester).should_receive(:puts).once
       flexmock(requester).should_receive(:system)
       flexmock(HTTParty).should_receive(:get).once.with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
@@ -100,6 +101,7 @@ module Testbot::Requester
 
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, 'results' => '', "success" => true })
         flexmock(requester).should_receive(:sleep)
+        flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
         flexmock(requester).should_receive(:system)
 
@@ -119,9 +121,9 @@ module Testbot::Requester
                                                                 { "done" => true, "results" => "job 2 done: ....job 1 done: ...." })
                                                               mock_file_sizes
 
-        flexmock(requester).should_receive(:sleep).times(2).with(1)
-        flexmock(requester).should_receive(:puts).once.with("job 2 done: ....")
-        flexmock(requester).should_receive(:puts).once.with("job 1 done: ....")
+        flexmock(requester).should_receive(:sleep).times(2).with(0.5)
+        flexmock(requester).should_receive(:print).once.with("job 2 done: ....")
+        flexmock(requester).should_receive(:print).once.with("job 1 done: ....")
         flexmock(requester).should_receive(:puts).once.with("\nformatted result")
 
         flexmock(RspecAdapter).should_receive(:sum_results).with("job 2 done: ....job 1 done: ....").and_return("formatted result")
@@ -141,9 +143,9 @@ module Testbot::Requester
                                                                 { "done" => true, "results" => "job 2 done: ....job 1 done: ...." })
         mock_file_sizes
 
-        flexmock(requester).should_receive(:sleep).times(2).with(1)
-        flexmock(requester).should_receive(:puts).once.with("job 2 done: ....")
-        flexmock(requester).should_receive(:puts).once.with("job 1 done: ....")
+        flexmock(requester).should_receive(:sleep).times(2).with(0.5)
+        flexmock(requester).should_receive(:print).once.with("job 2 done: ....")
+        flexmock(requester).should_receive(:print).once.with("job 1 done: ....")
         flexmock(requester).should_receive(:puts).once.with("\n\033[32m0 examples, 0 failures\033[0m")
 
         requester.run_tests(RspecAdapter, 'spec')
@@ -160,8 +162,8 @@ module Testbot::Requester
         flexmock(HTTParty).should_receive(:get).once.with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                           :format => :json).and_return({ "success" => false, "done" => true, "results" => "job 2 done: ....job 1 done: ...." })
 
-        flexmock(requester).should_receive(:sleep).once.with(1)
-        flexmock(requester).should_receive(:puts).once.with("job 2 done: ....job 1 done: ....")
+        flexmock(requester).should_receive(:sleep).once.with(0.5)
+        flexmock(requester).should_receive(:print).once.with("job 2 done: ....job 1 done: ....")
         flexmock(requester).should_receive(:puts).once.with("\n\033[32m0 examples, 0 failures\033[0m")
         mock_file_sizes
 
@@ -180,8 +182,8 @@ module Testbot::Requester
                                                               :format => :json).and_return({ "done" => false, "results" => "" },
                                                                 { "done" => true, "results" => "job 2 done: ....job 1 done: ...." })
 
-        flexmock(requester).should_receive(:sleep).times(2).with(1)
-        flexmock(requester).should_receive(:puts).once.with("job 2 done: ....job 1 done: ....")
+        flexmock(requester).should_receive(:sleep).times(2).with(0.5)
+        flexmock(requester).should_receive(:print).once.with("job 2 done: ....job 1 done: ....")
         flexmock(requester).should_receive(:puts).once.with("\n\033[32m0 examples, 0 failures\033[0m")
         mock_file_sizes
 
@@ -196,6 +198,7 @@ module Testbot::Requester
 
         flexmock(HTTParty).should_receive(:post).and_return('5')
         flexmock(requester).should_receive(:sleep).once
+        flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
         flexmock(HTTParty).should_receive(:get).once.with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                           :format => :json).and_return({ "done" => true, "results" => "" })
@@ -219,9 +222,9 @@ module Testbot::Requester
                                                               flexmock(HTTParty).should_receive(:get).times(1).with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                                                                                     :format => :json).and_return({ "done" => true, "results" => "job 2 done: ....job 1 done: ...." })
 
-        flexmock(requester).should_receive(:sleep).times(6).with(1)
+        flexmock(requester).should_receive(:sleep).times(6).with(0.5)
         flexmock(requester).should_receive(:puts).once.with("Failed to get status: some connection error")
-        flexmock(requester).should_receive(:puts).once.with("job 2 done: ....job 1 done: ....")
+        flexmock(requester).should_receive(:print).once.with("job 2 done: ....job 1 done: ....")
         flexmock(requester).should_receive(:puts).once.with("\n\033[32m0 examples, 0 failures\033[0m")
         mock_file_sizes
 
@@ -240,8 +243,8 @@ module Testbot::Requester
                                                               :format => :json).and_return(nil,
                                                                 { "done" => true, "results" => "job 2 done: ....job 1 done: ...." })
 
-        flexmock(requester).should_receive(:sleep).times(2).with(1)
-        flexmock(requester).should_receive(:puts).once.with("job 2 done: ....job 1 done: ....")
+        flexmock(requester).should_receive(:sleep).times(2).with(0.5)
+        flexmock(requester).should_receive(:print).once.with("job 2 done: ....job 1 done: ....")
         flexmock(requester).should_receive(:puts).once.with("\n\033[32m0 examples, 0 failures\033[0m")
         mock_file_sizes
 
@@ -260,10 +263,11 @@ module Testbot::Requester
                                                               :format => :json).and_return(nil,
                                                                 { "done" => true, "results" => "testbot4:\n....\n\nFinished in 84.333 seconds\n\n206 examples, 0 failures, 2 pending; testbot4:\n.F..\n\nFinished in 84.333 seconds\n\n206 examples, 0 failures, 2 pending" })
 
-        flexmock(requester).should_receive(:sleep).times(2).with(1)
+        flexmock(requester).should_receive(:sleep).times(2).with(0.5)
 
         # Imperfect match, includes "." in 84.333, but good enough.
         flexmock(requester).should_receive(:print).once.with("......F...")
+        flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
         mock_file_sizes
 
@@ -281,6 +285,7 @@ module Testbot::Requester
         flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2299/builds", any).and_return('5')
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
+        flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
         mock_file_sizes
 
@@ -298,6 +303,7 @@ module Testbot::Requester
         flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2299/builds", any).and_return('5')
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
+        flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
 
         flexmock(requester).should_receive('system').with("rsync -az --delete -e ssh  . cruise@somewhere:/tmp/testbot/foo")
@@ -317,6 +323,7 @@ module Testbot::Requester
         flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2230/builds", any).and_return('5')
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
+        flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
         mock_file_sizes
 
@@ -334,6 +341,7 @@ module Testbot::Requester
         flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2231/builds", any).and_return('5')
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
+        flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
         mock_file_sizes
 
@@ -354,6 +362,7 @@ module Testbot::Requester
         flexmock(HTTParty).should_receive(:post).with(any, :body => other_args.merge({ :jruby => true })).and_return('5')
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
+        flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
         mock_file_sizes
 

data/test/runner/job_test.rb

@@ -8,11 +8,11 @@ module Testbot::Runner
 
   class JobTest < Test::Unit::TestCase
 
-    def expect_put_with(id, result_text, success, time = 0)
+    def expect_put_with(id, result_text, status, time = 0)
       expected_result = "\n#{`hostname`.chomp}:#{Dir.pwd}\n"
       expected_result += result_text
       flexmock(Server).should_receive(:put).once.with("/jobs/#{id}", :body =>
-                                                      { :result => expected_result, :success => success, :time => time })
+                                                      { :result => expected_result, :status => status, :time => time })
     end
 
     def stub_duration(seconds)
@@ -25,7 +25,7 @@ module Testbot::Runner
       flexmock(job).should_receive(:puts)
       stub_duration(0)
 
-      expect_put_with(10, "result text", true)
+      expect_put_with(10, "result text", "successful")
       flexmock(job).should_receive(:run_and_return_result).once.
         with("export RAILS_ENV=test; export TEST_ENV_NUMBER=; cd project; export RSPEC_COLOR=true; ruby -S bundle exec rspec spec/foo_spec.rb spec/bar_spec.rb").
         and_return('result text')
@@ -38,7 +38,7 @@ module Testbot::Runner
       flexmock(job).should_receive(:puts)
       stub_duration(0)
 
-      expect_put_with(10, "result text", false)
+      expect_put_with(10, "result text", "failed")
       flexmock(job).should_receive(:run_and_return_result).and_return('result text')
       flexmock(job).should_receive(:success?).and_return(false)
       job.run(0)
@@ -49,7 +49,7 @@ module Testbot::Runner
       flexmock(job).should_receive(:puts)
       stub_duration(0)
 
-      expect_put_with(10, "result text", true)
+      expect_put_with(10, "result text", "successful")
       flexmock(job).should_receive(:run_and_return_result).
         with(/TEST_ENV_NUMBER=2/).
         and_return('result text')
@@ -61,7 +61,7 @@ module Testbot::Runner
       flexmock(job).should_receive(:puts)
 
       stub_duration(10.55) 
-      expect_put_with(10, "result text", true, 1055)
+      expect_put_with(10, "result text", "successful", 1055)
       flexmock(job).should_receive(:run_and_return_result).and_return('result text')
       job.run(0)
     end

data/test/runner/safe_result_text_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../../lib/shared/testbot.rb'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../lib/runner/safe_result_text.rb'))
+require 'test/unit'
+require 'shoulda'
+
+module Testbot::Runner
+
+  class SafeResultTextTest < Test::Unit::TestCase
+
+    should "not break escape sequences" do
+      assert_equal "^[[32m.^[[0m^[[32m.^[[0m", SafeResultText.clean("^[[32m.^[[0m^[[32m.^[[0m^[[32m.")
+      assert_equal "^[[32m.^[[0m^[[32m.^[[0m", SafeResultText.clean("^[[32m.^[[0m^[[32m.^[[0m^[[3")
+      assert_equal "^[[32m.^[[0m", SafeResultText.clean("^[[32m.^[[0m^[")
+      assert_equal "[32m.[0m[32m.[0m[3", SafeResultText.clean("[32m.[0m[32m.[0m[3")
+      assert_equal "...", SafeResultText.clean("...")
+    end
+
+  end
+
+end

data/test/server/server_test.rb

@@ -375,18 +375,18 @@ module Testbot::Server
 
       should "receive the results of a job" do
         job = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now - 30
-        put "/jobs/#{job.id}", :result => 'test run result', :success => true
+        put "/jobs/#{job.id}", :result => 'test run result', :status => "successful"
         assert last_response.ok?
         assert_equal 'test run result', job.result
-        assert_equal 'true', job.success
+        assert_equal 'successful', job.status
       end
 
       should "update the related build" do
         build = Build.create
         job1 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now - 30, :build => build
         job2 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now - 30, :build => build      
-        put "/jobs/#{job1.id}", :result => 'test run result 1\n', :success => "true"
-        put "/jobs/#{job2.id}", :result => 'test run result 2\n', :success => "true"
+        put "/jobs/#{job1.id}", :result => 'test run result 1\n', :status => "successful"
+        put "/jobs/#{job2.id}", :result => 'test run result 2\n', :status => "successful"
         assert_equal 'test run result 1\ntest run result 2\n', build.results
         assert_equal true, build.success
       end
@@ -395,8 +395,8 @@ module Testbot::Server
         build = Build.create
         job1 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now - 30, :build => build
         job2 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now - 30, :build => build
-        put "/jobs/#{job1.id}", :result => 'test run result 1\n', :success => true
-        put "/jobs/#{job2.id}", :result => 'test run result 2\n', :success => true
+        put "/jobs/#{job1.id}", :result => 'test run result 1\n', :status => "successful"
+        put "/jobs/#{job2.id}", :result => 'test run result 2\n', :status => "successful"
         assert_equal true, build.done
       end
 
@@ -404,11 +404,26 @@ module Testbot::Server
         build = Build.create
         job1 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now - 30, :build => build
         job2 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now - 30, :build => build
-        put "/jobs/#{job1.id}", :result => 'test run result 1\n', :success => false
-        put "/jobs/#{job2.id}", :result => 'test run result 2\n', :success => true
+        put "/jobs/#{job1.id}", :result => 'test run result 1\n', :status => "failed"
+        put "/jobs/#{job2.id}", :result => 'test run result 2\n', :status => "successful"
         assert_equal false, build.success
       end 
 
+      should "be able to update from multiple result postings" do
+        build = Build.create
+        job1 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now - 30, :build => build
+        job2 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now - 30, :build => build
+        # maybe later:
+        # put "/jobs/#{job.id}", :result => 'Preparing, db setup, etc.', :status => "preparing"
+        put "/jobs/#{job1.id}", :result => 'Running tests..', :status => "running"
+        put "/jobs/#{job2.id}", :result => 'Running other tests. done.', :status => "successful"
+        put "/jobs/#{job1.id}", :result => 'Running tests....', :status => "running"
+        assert_equal false, build.done
+        assert_equal false, job1.done
+        assert_equal "Running tests....", job1.result
+        assert_equal "Running tests..Running other tests. done...", build.results
+      end
+
     end
 
     context "GET /version" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-19 00:00:00 +02:00
+date: 2012-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -259,6 +259,7 @@ files:
 - lib/requester/requester.rb
 - lib/runner/job.rb
 - lib/runner/runner.rb
+- lib/runner/safe_result_text.rb
 - lib/server/build.rb
 - lib/server/group.rb
 - lib/server/job.rb
@@ -295,6 +296,7 @@ files:
 - test/requester/testbot_with_erb.yml
 - test/runner/job_test.rb
 - test/runner/runner_test.rb
+- test/runner/safe_result_text_test.rb
 - test/server/group_test.rb
 - test/server/server_test.rb
 - test/shared/adapters/adapter_test.rb