testbot 0.7.2 → 0.7.3

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.7.3
+
+Increased time between updates to avoid timeouts. Allow timeout when posting
+incremental build results (but not when posting the final results).
+
+Should make testbot more stable for some people.
+
 0.7.2
 
 Increased timeout on http requests to the server to 10 seconds.

data/lib/runner/job.rb

@@ -6,6 +6,8 @@ module Testbot::Runner
   class Job
     attr_reader :root, :project, :build_id
 
+    TIME_TO_WAIT_BETWEEN_POSTING_RESULTS = 5
+
     def initialize(runner, id, build_id, project, root, type, ruby_interpreter, files)
       @runner, @id, @build_id, @project, @root, @type, @ruby_interpreter, @files =
         runner, id, build_id, project, root, type, ruby_interpreter, files
@@ -58,17 +60,19 @@ module Testbot::Runner
 
     def post_results(output)
       Server.put("/jobs/#{@id}", :body => { :result => SafeResultText.clean(output), :status => "building" })
+    rescue Timeout::Error
+      puts "Got a timeout when posting an job result update. This can happen when the server is busy and is not a critical error."
     end
 
     def run_and_return_result(command)
       read_pipe = spawn_process(command)
-      
+
       output = ""
       last_post_time = Time.now
       while char = read_pipe.getc
         char = (char.is_a?(Fixnum) ? char.chr : char) # 1.8 <-> 1.9
         output << char
-        if Time.now - last_post_time > 0.5
+        if Time.now - last_post_time > TIME_TO_WAIT_BETWEEN_POSTING_RESULTS
           post_results(output)
           last_post_time = Time.now
         end

data/lib/shared/version.rb

@@ -1,7 +1,7 @@
 module Testbot
   # Don't forget to update readme and changelog
   def self.version
-    version = "0.7.2"
+    version = "0.7.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/runner/job_test.rb

@@ -15,8 +15,16 @@ module Testbot::Runner
                                                       { :result => expected_result, :status => status, :time => time })
     end
 
+    def expect_put
+      flexmock(Server).should_receive(:put).once
+    end
+
+    def expect_put_to_timeout
+      flexmock(Server).should_receive(:put).and_raise(Timeout::Error)
+    end
+
     def stub_duration(seconds)
-      time ||= Time.now 
+      time ||= Time.now
       flexmock(Time).should_receive(:now).and_return(time, time + seconds)
     end
 
@@ -34,7 +42,19 @@ module Testbot::Runner
       job.run(0)
     end
 
-    should "return false on success if the job fails" do
+    should "not raise an error when posting results time out" do
+      job = Job.new(Runner.new({}), 10, "00:00", "project", "/tmp/testbot/user", "spec", "ruby", "spec/foo_spec.rb spec/bar_spec.rb")
+      flexmock(job).should_receive(:puts)
+
+      # We're using send here because triggering post_results though the rest of the
+      # code requires very complex setup. The code need to be refactored to be more testable.
+      expect_put
+      job.send(:post_results, "result text")
+      expect_put_to_timeout
+      job.send(:post_results, "result text")
+    end
+
+    should "not be successful when the job fails" do
       job = Job.new(Runner.new({}), 10, "00:00", "project", "/tmp/testbot/user", "spec", "ruby", "spec/foo_spec.rb spec/bar_spec.rb")
       flexmock(job).should_receive(:puts)
       stub_duration(0)
@@ -62,7 +82,7 @@ module Testbot::Runner
       job = Job.new(Runner.new({}), 10, "00:00", "project", "/tmp/testbot/user", "spec", "ruby", "spec/foo_spec.rb spec/bar_spec.rb")
       flexmock(job).should_receive(:puts)
 
-      stub_duration(10.55) 
+      stub_duration(10.55)
       expect_put_with(10, "result text", "successful", 1055)
       flexmock(job).should_receive(:run_and_return_result).and_return('result text')
       flexmock(RubyEnv).should_receive(:rvm?).returns(false)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-28 00:00:00 +01:00
+date: 2013-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency