testbot 0.6.3 → 0.6.4

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.6.4
+
+Fixed bug with running test unit tests that caused errors like '/bin/ruby:1: Invalid char `\317' in expression`'.
+
+Now handling errors creating builds.
+
+Returning 503 and reporting that there are no runners when that is the case.
+
 0.6.3
 
 Results are now shown as they happen. It takes care not to break escape codes used for

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.3'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.6.4'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)

data/lib/requester/requester.rb

@@ -51,13 +51,23 @@ module Testbot::Requester
 
       build_id = nil
       log "Requesting run" do
-        build_id = HTTParty.post("#{server_uri}/builds", :body => { :root => root,
+        response = 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? })
+                                 :jruby => jruby? }).response
+
+        if response.code == "503"
+          puts "No runners available. If you just started a runner, try again. It usually takes a few seconds before they're available."
+          return false
+        elsif response.code != "200"
+          puts "Could not create build, #{response.code}: #{response.body}"
+          return false
+        else
+          build_id = response.body
+        end
       end
 
       trap("SIGINT") {  HTTParty.delete("#{server_uri}/builds/#{build_id}"); return false }

data/lib/server/runner.rb

@@ -30,7 +30,7 @@ module Testbot::Server
     end
 
     def self.find_all_available
-      all.find_all { |r| r.version == Testbot.version && r.last_seen_at > (Time.now - Runner.timeout) }
+      all.find_all { |r| r.idle_instances && r.version == Testbot.version && r.last_seen_at > (Time.now - Runner.timeout) }
     end  
 
     def self.available_instances

data/lib/server/server.rb

@@ -24,7 +24,11 @@ module Testbot::Server
   end
 
   post '/builds' do
-    build = Build.create_and_build_jobs(params).id.to_s
+    if Runner.total_instances == 0
+      [ 503, "No runners available" ]
+    else
+      Build.create_and_build_jobs(params).id.to_s
+    end
   end
 
   get '/builds/:id' do

data/lib/shared/adapters/helpers/ruby_env.rb

@@ -12,13 +12,13 @@ class RubyEnv
     elsif opts[:bin]
       command = opts[:bin]
     else
-      command = ruby_interpreter
+      command = nil
     end
 
     if bundler?(project_path)
-      "#{ruby_interpreter} -S bundle exec #{command}"
+      "#{ruby_interpreter} -S bundle exec #{command}".strip
     else
-      "#{ruby_interpreter} -S #{command}"
+      "#{ruby_interpreter} -S #{command}".strip
     end
   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.6.3"
+    version = "0.6.4"
     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

@@ -17,7 +17,7 @@ module Testbot::Requester
       requester = Requester.new(:server_host => "192.168.1.100", :rsync_path => 'user@server:/tmp/somewhere')
 
       flexmock(requester).should_receive(:find_tests).and_return([])
-      flexmock(HTTParty).should_receive(:post).and_return('5')
+      flexmock(HTTParty).should_receive(:post).and_return(response_with_build_id)
       flexmock(requester).should_receive(:sleep).once
       flexmock(requester).should_receive(:print).once
       flexmock(requester).should_receive(:puts).once
@@ -27,6 +27,14 @@ module Testbot::Requester
                                                         requester
     end
 
+    def response_with_build_id
+      OpenStruct.new(:response => OpenStruct.new(:code => "200", :body => "5"))
+    end
+
+    def error_response(opts = {})
+      OpenStruct.new(:response => OpenStruct.new(opts))
+    end
+
     def build_with_result(results)
       requester_with_result(results).run_tests(RspecAdapter, 'spec')
     end
@@ -97,7 +105,7 @@ module Testbot::Requester
                                                              :files => "spec/models/house_spec.rb" +
                                                              " spec/models/car_spec.rb",
                                                              :sizes => "10 20",
-                                                             :jruby => false })
+                                                             :jruby => false }).and_return(response_with_build_id)
 
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, 'results' => '', "success" => true })
         flexmock(requester).should_receive(:sleep)
@@ -108,13 +116,35 @@ module Testbot::Requester
         assert_equal true, requester.run_tests(RspecAdapter, 'spec')
       end
 
+      should "print a message and exit if the status is 503" do
+        requester = Requester.new(:server_host => "192.168.1.100")
+
+        flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
+        flexmock(requester).should_receive(:system)
+
+        flexmock(HTTParty).should_receive(:post).and_return(error_response(:code => "503"))
+        flexmock(requester).should_receive(:puts)
+        assert_equal false, requester.run_tests(RspecAdapter, 'spec')
+      end
+
+      should "print what the server returns in case there is anything but a 200 response" do
+        requester = Requester.new(:server_host => "192.168.1.100")
+
+        flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
+        flexmock(requester).should_receive(:system)
+
+        flexmock(HTTParty).should_receive(:post).and_return(error_response(:code => "123", :body => "Some error"))
+        flexmock(requester).should_receive(:puts).with("Could not create build, 123: Some error")
+        assert_equal false, requester.run_tests(RspecAdapter, 'spec')
+      end
+
       should "print the sum of results formatted by the adapter" do
         requester = Requester.new(:server_host => "192.168.1.100")
 
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
         flexmock(requester).should_receive(:system)
 
-        flexmock(HTTParty).should_receive(:post).and_return('5')
+        flexmock(HTTParty).should_receive(:post).and_return(response_with_build_id)
 
         flexmock(HTTParty).should_receive(:get).times(2).with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                               :format => :json).and_return({ "done" => false, "results" => "job 2 done: ...." },
@@ -136,7 +166,7 @@ module Testbot::Requester
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
         flexmock(requester).should_receive(:system)
 
-        flexmock(HTTParty).should_receive(:post).and_return('5')
+        flexmock(HTTParty).should_receive(:post).and_return(response_with_build_id)
 
         flexmock(HTTParty).should_receive(:get).times(2).with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                               :format => :json).and_return({ "done" => false, "results" => "job 2 done: ...." },
@@ -157,7 +187,7 @@ module Testbot::Requester
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
         flexmock(requester).should_receive(:system)
 
-        flexmock(HTTParty).should_receive(:post).and_return('5')
+        flexmock(HTTParty).should_receive(:post).and_return(response_with_build_id)
 
         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: ...." })
@@ -176,7 +206,7 @@ module Testbot::Requester
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
         flexmock(requester).should_receive(:system)
 
-        flexmock(HTTParty).should_receive(:post).and_return('5')
+        flexmock(HTTParty).should_receive(:post).and_return(response_with_build_id)
 
         flexmock(HTTParty).should_receive(:get).times(2).with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                               :format => :json).and_return({ "done" => false, "results" => "" },
@@ -196,7 +226,7 @@ module Testbot::Requester
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
         flexmock(requester).should_receive(:system)
 
-        flexmock(HTTParty).should_receive(:post).and_return('5')
+        flexmock(HTTParty).should_receive(:post).and_return(response_with_build_id)
         flexmock(requester).should_receive(:sleep).once
         flexmock(requester).should_receive(:print)
         flexmock(requester).should_receive(:puts)
@@ -215,7 +245,7 @@ module Testbot::Requester
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
         flexmock(requester).should_receive(:system)
 
-        flexmock(HTTParty).should_receive(:post).and_return('5')
+        flexmock(HTTParty).should_receive(:post).and_return(response_with_build_id)
 
         flexmock(HTTParty).should_receive(:get).times(5).with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                               :format => :json).and_raise('some connection error')
@@ -237,7 +267,7 @@ module Testbot::Requester
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
         flexmock(requester).should_receive(:system)
 
-        flexmock(HTTParty).should_receive(:post).and_return('5')
+        flexmock(HTTParty).should_receive(:post).and_return(response_with_build_id)
 
         flexmock(HTTParty).should_receive(:get).times(2).with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                               :format => :json).and_return(nil,
@@ -257,7 +287,7 @@ module Testbot::Requester
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb', 'spec_models/car_spec.rb' ])
         flexmock(requester).should_receive(:system)
 
-        flexmock(HTTParty).should_receive(:post).and_return('5')
+        flexmock(HTTParty).should_receive(:post).and_return(response_with_build_id)
 
         flexmock(HTTParty).should_receive(:get).times(2).with("http://192.168.1.100:#{Testbot::SERVER_PORT}/builds/5",
                                                               :format => :json).and_return(nil,
@@ -282,7 +312,7 @@ module Testbot::Requester
         flexmock(ssh_tunnel).should_receive(:open).once
 
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb' ])
-        flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2299/builds", any).and_return('5')
+        flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2299/builds", any).and_return(response_with_build_id)
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
         flexmock(requester).should_receive(:print)
@@ -300,7 +330,7 @@ module Testbot::Requester
         flexmock(ssh_tunnel).should_receive(:open).once
 
         flexmock(requester).should_receive(:find_tests).and_return([ 'spec/models/house_spec.rb' ])
-        flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2299/builds", any).and_return('5')
+        flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2299/builds", any).and_return(response_with_build_id)
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
         flexmock(requester).should_receive(:print)
@@ -320,7 +350,7 @@ module Testbot::Requester
         flexmock(ssh_tunnel).should_receive(:open).once
 
         flexmock(requester).should_receive(:find_tests).and_return([ 'features/some.feature' ])
-        flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2230/builds", any).and_return('5')
+        flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2230/builds", any).and_return(response_with_build_id)
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
         flexmock(requester).should_receive(:print)
@@ -338,7 +368,7 @@ module Testbot::Requester
         flexmock(ssh_tunnel).should_receive(:open).once
 
         flexmock(requester).should_receive(:find_tests).and_return([ 'test/some_test.rb' ])
-        flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2231/builds", any).and_return('5')
+        flexmock(HTTParty).should_receive(:post).with("http://127.0.0.1:2231/builds", any).and_return(response_with_build_id)
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
         flexmock(requester).should_receive(:print)
@@ -359,7 +389,7 @@ module Testbot::Requester
           :sizes=>"0", :project=>"project" }
 
         flexmock(TestUnitAdapter).should_receive(:test_files).and_return([ 'test/some_test.rb' ])
-        flexmock(HTTParty).should_receive(:post).with(any, :body => other_args.merge({ :jruby => true })).and_return('5')
+        flexmock(HTTParty).should_receive(:post).with(any, :body => other_args.merge({ :jruby => true })).and_return(response_with_build_id)
         flexmock(HTTParty).should_receive(:get).and_return({ "done" => true, "results" => "job 1 done: ...." })
         flexmock(requester).should_receive(:sleep)
         flexmock(requester).should_receive(:print)

data/test/server/server_test.rb

@@ -62,6 +62,14 @@ module Testbot::Server
         assert_equal Build.all.first, first_job.build
       end
 
+      should "return a 503 error if there are no known runners" do
+        flexmock(Runner).should_receive(:total_instances).and_return(0)
+        post '/builds', :files => 'spec/models/car_spec.rb spec/models/car2_spec.rb spec/models/house_spec.rb spec/models/house2_spec.rb', :root => 'server:/path/to/project', :type => 'spec', :available_runner_usage => "100%", :project => 'things', :sizes => "1 1 1 1", :jruby => true
+        assert_equal 0, Job.count
+        assert_equal 503, last_response.status
+        assert_equal "No runners available", last_response.body
+      end
+
       should "only use resources according to available_runner_usage" do
         flexmock(Runner).should_receive(:total_instances).and_return(4)
         flexmock(Group).should_receive(:build).with(["spec/models/car_spec.rb", "spec/models/car2_spec.rb", "spec/models/house_spec.rb", "spec/models/house2_spec.rb"], [ 1, 1, 1, 1 ], 2, 'spec').and_return([])
@@ -267,6 +275,14 @@ module Testbot::Server
         assert_equal "127.0.0.1 macmini1.local 00:01 user1 2\n127.0.0.1 macmini2.local 00:02 user2 4", last_response.body
       end
 
+      should "not return a runner as available when it hasnt pinged the server yet" do
+        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini1.local', :uid => "00:01", :username => 'user1'
+        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini2.local', :uid => "00:02", :idle_instances => 4, :username => 'user2'
+        get '/runners/available'
+        assert last_response.ok?
+        assert_equal "127.0.0.1 macmini2.local 00:02 user2 4", last_response.body
+      end
+
       should "not return runners as available when not seen the last 10 seconds" do
         get '/jobs/next', :version => Testbot.version, :hostname => 'macmini1.local', :uid => "00:01", :idle_instances => 2, :username => "user1"
         get '/jobs/next', :version => Testbot.version, :hostname => 'macmini2.local', :uid => "00:02", :idle_instances => 4
@@ -301,16 +317,16 @@ module Testbot::Server
     context "GET /runners/total_instances" do
 
       should "return the number of available runner instances" do
-        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini1.local', :uid => "00:01", :max_instances => 2
-        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini2.local', :uid => "00:02", :max_instances => 4
+        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini1.local', :uid => "00:01", :max_instances => 2, :idle_instances => 1
+        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini2.local', :uid => "00:02", :max_instances => 4, :idle_instances => 2
         get '/runners/total_instances'
         assert last_response.ok?
         assert_equal "6", last_response.body
       end    
 
       should "not return instances as available when not seen the last 10 seconds" do
-        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini1.local', :uid => "00:01", :max_instances => 2
-        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini2.local', :uid => "00:02", :max_instances => 4
+        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini1.local', :uid => "00:01", :max_instances => 2, :idle_instances => 1
+        get '/jobs/next', :version => Testbot.version, :hostname => 'macmini2.local', :uid => "00:02", :max_instances => 4, :idle_instances => 2
         Runner.find_by_uid("00:02").update(:last_seen_at => Time.now - 10)
         get '/runners/total_instances'
         assert last_response.ok?

data/test/shared/adapters/helpers/ruby_env_test.rb

@@ -71,11 +71,19 @@ class RubyEnvTest < Test::Unit::TestCase
                                                                             :bin => "rspec", :ruby_interpreter => "jruby")
     end
 
-    should "use the interpeter when there is no binary specified" do
+    should "work when there is no binary specified and bundler is present" do
       flexmock(RubyEnv).should_receive(:bundler?).and_return(true)
       flexmock(File).should_receive(:exists?).and_return(false)
-      assert_equal 'ruby -S bundle exec ruby', RubyEnv.ruby_command("path/to/project")
+      assert_equal 'ruby -S bundle exec', RubyEnv.ruby_command("path/to/project")
     end
+
+    should "work when there is no binary specified and bundler is not present" do
+      flexmock(RubyEnv).should_receive(:bundler?).and_return(false)
+      flexmock(File).should_receive(:exists?).and_return(false)
+      assert_equal 'ruby -S', RubyEnv.ruby_command("path/to/project")
+    end
+
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"