testbot 0.5.8 → 0.5.9

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.5.9
+
+When you hit ctrl+c all related test jobs will be stopped (within about 5 seconds). You can
+now exit, change code and re-run much faster than before.
+
+It does not stop before_run or code fetch. But no tests will be run after
+those complete when the build is stopped.
+
 0.5.8
 
 Now only running tests from one build on a runner at a time.

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.5.8'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.5.9'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)
@@ -107,6 +107,7 @@ Features
 * Testbot will try to balance the testload so that every computer finishes running the tests at the same time to reduce the time it takes to run the entire test suite. It does a good job, but has potential for further improvement.
 * 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.
 * Testbot is continuously tested for compability with Ruby 1.8.7 and 1.9.2.
 
 Contributing to testbot

data/lib/requester/requester.rb

@@ -53,6 +53,7 @@ module Testbot::Requester
                                :sizes => sizes.join(' '),
                                :jruby => jruby? })
 
+      trap("SIGINT") {  HTTParty.delete("#{server_uri}/builds/#{build_id}"); return false }
 
       last_results_size = 0
       success = true

data/lib/runner/job.rb

@@ -14,6 +14,7 @@ module Testbot::Runner
     end
 
     def run(instance)
+      return if @killed
       puts "Running job #{@id} (build #{@build_id})... "
       test_env_number = (instance == 0) ? '' : instance + 1
       result = "\n#{`hostname`.chomp}:#{Dir.pwd}\n"
@@ -28,6 +29,14 @@ module Testbot::Runner
       puts "Job #{@id} finished."
     end
 
+    def kill!(build_id)
+      if @build_id == build_id && @test_process
+        # The child process that runs the tests is a shell, we need to kill it's child process
+        system("pkill -KILL -P #{@test_process.pid}")
+        @killed = true
+      end
+    end
+
     private
 
     def measure_run_time
@@ -37,7 +46,10 @@ module Testbot::Runner
     end
 
     def run_and_return_result(command)
-      `#{command} 2>&1`
+      @test_process = open("|#{command} 2>&1", 'r')
+      output = @test_process.read
+      @test_process.close
+      output
     end
 
     def success?

data/lib/runner/runner.rb

@@ -107,9 +107,9 @@ module Testbot::Runner
           before_run(job) if File.exists?("#{job.project}/lib/tasks/testbot.rake")
         end
 
+        @last_build_id = job.build_id
         @instances << [ Thread.new { job.run(free_instance_number) },
           free_instance_number, job ]
-        @last_build_id = job.build_id
         loop do
           clear_completed_instances
           break unless max_instances_running?
@@ -164,7 +164,7 @@ module Testbot::Runner
 
     def ping_params
       { :hostname => (@hostname ||= `hostname`.chomp), :max_instances => @config.max_instances,
-        :idle_instances => (@config.max_instances - @instances.size), :username => ENV['USER'] }.merge(base_params)
+        :idle_instances => (@config.max_instances - @instances.size), :username => ENV['USER'], :build_id => @last_build_id }.merge(base_params)
     end
 
     def base_params
@@ -191,7 +191,11 @@ module Testbot::Runner
       Thread.new do
         while true
           begin
-            Server.get("/runners/ping", :body => ping_params)
+            response = Server.get("/runners/ping", :body => ping_params).body
+            if response.include?('stop_build')
+              build_id = response.split(',').last
+              @instances.each { |instance, n, job| job.kill!(build_id) }
+            end
           rescue
           end
           sleep TIME_BETWEEN_PINGS

data/lib/server/server.rb

@@ -33,6 +33,12 @@ module Testbot::Server
     { "done" => build.done, "results" => build.results, "success" => build.success }.to_json
   end
 
+  delete '/builds/:id' do
+    build = Build.find(params[:id])
+    build.destroy if build
+    nil
+  end
+
   get '/jobs/next' do
     next_job, runner = Job.next(params, @env['REMOTE_ADDR'])
     if next_job
@@ -48,7 +54,12 @@ module Testbot::Server
   get '/runners/ping' do
     return unless Server.valid_version?(params[:version])
     runner = Runner.find_by_uid(params[:uid])
-    runner.update(params.merge({ :last_seen_at => Time.now })) if runner
+    if runner
+      runner.update(params.reject { |k, v| k == "build_id" }.merge({ :last_seen_at => Time.now, :build => Build.find(params[:build_id]) }))
+      unless params[:build_id] == '' || params[:build_id] == nil || runner.build
+        return "stop_build,#{params[:build_id]}"
+      end
+    end
     nil
   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.5.8"
+    version = "0.5.9"
     dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
     if File.exists?(dev_version_file)
       version += File.read(dev_version_file)

data/test/server/server_test.rb

@@ -330,8 +330,9 @@ module Testbot::Server
       end
 
       should "update data on the runner" do
+        build = Build.create
         runner = Runner.create(:uid => 'aa:aa:..')
-        get "/runners/ping", :uid => 'aa:aa:..', :max_instances => 4, :idle_instances => 2, :hostname => "hostname1", :version => Testbot.version, :username => 'jocke'
+        get "/runners/ping", :uid => 'aa:aa:..', :max_instances => 4, :idle_instances => 2, :hostname => "hostname1", :version => Testbot.version, :username => 'jocke', :build_id => build.id
         assert last_response.ok?
         assert_equal 'aa:aa:..', runner.uid
         assert_equal 4, runner.max_instances
@@ -339,6 +340,7 @@ module Testbot::Server
         assert_equal 'hostname1', runner.hostname
         assert_equal Testbot.version, runner.version
         assert_equal 'jocke', runner.username
+        assert_equal build, runner.build
       end
 
       should "do nothing if the version does not match" do
@@ -353,6 +355,20 @@ module Testbot::Server
         assert last_response.ok?
       end
 
+      should "return an order to stop the build if the build id does not exist anymore" do
+        runner = Runner.create(:uid => 'aa:aa:..')
+        get "/runners/ping", :uid => 'aa:aa:..', :max_instances => 4, :idle_instances => 2, :hostname => "hostname1", :version => Testbot.version, :username => 'jocke', :build_id => 1
+        assert_equal last_response.body, "stop_build,1"
+      end
+
+      should "not return an order to stop a build without an id" do
+        runner = Runner.create(:uid => 'aa:aa:..')
+        get "/runners/ping", :uid => 'aa:aa:..', :max_instances => 4, :idle_instances => 2, :hostname => "hostname1", :version => Testbot.version, :username => 'jocke', :build_id => ''
+        assert_equal last_response.body, ''
+        get "/runners/ping", :uid => 'aa:aa:..', :max_instances => 4, :idle_instances => 2, :hostname => "hostname1", :version => Testbot.version, :username => 'jocke', :build_id => nil
+        assert_equal last_response.body, ''
+      end
+
     end
 
     context "PUT /jobs/:id" do
@@ -409,11 +425,11 @@ module Testbot::Server
 
       should "return runner information in json format" do
         get '/jobs/next', :version => Testbot.version, :uid => "00:01"
-        get "/runners/ping", :uid => '00:01', :max_instances => 4, :idle_instances => 2, :hostname => "hostname1", :version => Testbot.version, :username => 'testbot'
+        get "/runners/ping", :uid => '00:01', :max_instances => 4, :idle_instances => 2, :hostname => "hostname1", :version => Testbot.version, :username => 'testbot', :build_id => nil
         get '/runners'
         
         assert last_response.ok?
-        assert_equal ([ { "version" => Testbot.version.to_s, "hostname" => 'hostname1', "uid" => "00:01",
+        assert_equal ([ { "version" => Testbot.version.to_s, "build" => nil, "hostname" => 'hostname1', "uid" => "00:01",
                           "idle_instances" => 2, "max_instances" => 4, "username" => 'testbot',
                           "ip" => "127.0.0.1", "last_seen_at" => Runner.first.last_seen_at.to_s } ]),
                      JSON.parse(last_response.body)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,11 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 +02:00
+date: 2011-06-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: sinatra
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -30,12 +32,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
-  name: sinatra
   type: :runtime
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: httparty
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,12 +48,12 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  prerelease: false
-  name: httparty
   type: :runtime
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: macaddr
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +64,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
-  name: macaddr
   type: :runtime
-  requirement: *id003
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: net-ssh
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,12 +80,12 @@ dependencies:
         - 0
         - 23
         version: 2.0.23
-  prerelease: false
-  name: net-ssh
   type: :runtime
-  requirement: *id004
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: json_pure
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,12 +96,12 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
-  prerelease: false
-  name: json_pure
   type: :runtime
-  requirement: *id005
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: daemons
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,12 +112,12 @@ dependencies:
         - 0
         - 10
         version: 1.0.10
-  prerelease: false
-  name: daemons
   type: :runtime
-  requirement: *id006
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: acts_as_rails3_generator
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,12 +126,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: acts_as_rails3_generator
   type: :runtime
-  requirement: *id007
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -138,12 +140,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: shoulda
   type: :development
-  requirement: *id008
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: rack-test
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -152,12 +154,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: rack-test
   type: :development
-  requirement: *id009
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: flexmock
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -166,12 +168,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: flexmock
   type: :development
-  requirement: *id010
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: cucumber
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -180,12 +182,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: cucumber
   type: :development
-  requirement: *id011
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: rvm
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -194,12 +196,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: rvm
   type: :development
-  requirement: *id012
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -208,12 +210,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: rake
   type: :development
-  requirement: *id013
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -222,12 +224,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: bundler
   type: :development
-  requirement: *id014
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  name: guard
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -236,12 +238,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: guard
   type: :development
-  requirement: *id015
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  name: guard-test
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -250,10 +252,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: guard-test
   type: :development
-  requirement: *id016
+  version_requirements: *id016
 description: Testbot is a test distribution tool that works with Rails, RSpec, RSpec2, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com