hydra 0.19.0 → 0.19.1

data/VERSION

@@ -1 +1 @@
-0.19.0
+0.19.1

data/hydra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hydra}
-  s.version = "0.19.0"
+  s.version = "0.19.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Gauthier"]
-  s.date = %q{2010-06-07}
+  s.date = %q{2010-06-18}
   s.description = %q{Spread your tests over multiple machines to test your code faster.}
   s.email = %q{nick@smartlogicsolutions.com}
   s.extra_rdoc_files = [
@@ -85,21 +85,21 @@ Gem::Specification.new do |s|
   s.summary = %q{Distributed testing toolkit}
   s.test_files = [
     "test/pipe_test.rb",
-     "test/test_helper.rb",
+     "test/sync_test.rb",
      "test/ssh_test.rb",
-     "test/message_test.rb",
-     "test/master_test.rb",
-     "test/fixtures/write_file.rb",
-     "test/fixtures/slow.rb",
-     "test/fixtures/write_file_with_pending_spec.rb",
-     "test/fixtures/write_file_spec.rb",
-     "test/fixtures/features/step_definitions.rb",
-     "test/fixtures/hello_world.rb",
      "test/fixtures/write_file_alternate_spec.rb",
      "test/fixtures/sync_test.rb",
+     "test/fixtures/hello_world.rb",
+     "test/fixtures/features/step_definitions.rb",
      "test/fixtures/assert_true.rb",
+     "test/fixtures/slow.rb",
+     "test/fixtures/write_file_spec.rb",
+     "test/fixtures/write_file_with_pending_spec.rb",
+     "test/fixtures/write_file.rb",
+     "test/message_test.rb",
+     "test/test_helper.rb",
+     "test/master_test.rb",
      "test/runner_test.rb",
-     "test/sync_test.rb",
      "test/worker_test.rb"
   ]
 

data/lib/hydra/listener/abstract.rb

@@ -2,7 +2,7 @@ module Hydra #:nodoc:
   module Listener #:nodoc:
     # Abstract listener that implements all the events
     # but does nothing.
-    class Abstract 
+    class Abstract
       # Create a new listener.
       #
       # Output: The IO object for outputting any information.
@@ -10,14 +10,23 @@ module Hydra #:nodoc:
       def initialize(output = $stdout)
         @output = output
       end
+
       # Fired when testing has started
       def testing_begin(files)
       end
 
-      # Fired when testing finishes
+      # Fired when testing finishes, after the workers shutdown
       def testing_end
       end
 
+      # Fired after runner processes have been started
+      def worker_begin(worker)
+      end
+
+      # Fired before shutting down the worker
+      def worker_end(worker)
+      end
+
       # Fired when a file is started
       def file_begin(file)
       end

data/lib/hydra/master.rb

@@ -9,7 +9,7 @@ module Hydra #:nodoc:
   #
   # The Master is run once for any given testing session.
   class YmlLoadError < StandardError; end
-  
+
   class Master
     include Hydra::Messages::Master
     include Open3
@@ -37,7 +37,7 @@ module Hydra #:nodoc:
         puts "Testing halted by user.  Untested files:"
         puts @incomplete_files.join("\n")
         exit
-      end 
+      end
 
       opts.stringify_keys!
       config_file = opts.delete('config') { nil }
@@ -54,7 +54,7 @@ module Hydra #:nodoc:
         rescue StandardError => e
           raise(YmlLoadError,"config file was found, but could not be parsed.\n#{$!.inspect}")
         end
-        
+
         opts.merge!(config_yml.stringify_keys!)
       end
       @files = Array(opts.fetch('files') { nil })
@@ -74,7 +74,7 @@ module Hydra #:nodoc:
       @environment = opts.fetch('environment') { 'test' }
 
       if @autosort
-        sort_files_from_report 
+        sort_files_from_report
         @event_listeners << Hydra::Listener::ReportGenerator.new(File.new(heuristic_file, 'w'))
       end
 
@@ -93,8 +93,11 @@ module Hydra #:nodoc:
     end
 
     # Message handling
-    
-    # Send a file down to a worker. 
+    def worker_begin(worker)
+      @event_listeners.each {|l| l.worker_begin(worker) }
+    end
+
+    # Send a file down to a worker.
     def send_file(worker)
       f = @files.shift
       if f
@@ -110,14 +113,20 @@ module Hydra #:nodoc:
     def process_results(worker, message)
       if message.output =~ /ActiveRecord::StatementInvalid(.*)[Dd]eadlock/ or
          message.output =~ /PGError: ERROR(.*)[Dd]eadlock/ or
-         message.output =~ /Mysql::Error: SAVEPOINT(.*)does not exist: ROLLBACK/
+         message.output =~ /Mysql::Error: SAVEPOINT(.*)does not exist: ROLLBACK/ or
+         message.output =~ /Mysql::Error: Deadlock found/
         trace "Deadlock detected running [#{message.file}]. Will retry at the end"
         @files.push(message.file)
+        send_file(worker)
       else
         @incomplete_files.delete_at(@incomplete_files.index(message.file))
         trace "#{@incomplete_files.size} Files Remaining"
         @event_listeners.each{|l| l.file_end(message.file, message.output) }
         if @incomplete_files.empty?
+          @workers.each do |worker|
+            @event_listeners.each{|l| l.worker_end(worker) }
+          end
+
           shutdown_all_workers
         else
           send_file(worker)
@@ -129,7 +138,7 @@ module Hydra #:nodoc:
     attr_reader :report_text
 
     private
-    
+
     def boot_workers(workers)
       trace "Booting #{workers.size} workers"
       workers.each do |worker|
@@ -148,12 +157,13 @@ module Hydra #:nodoc:
 
     def boot_local_worker(worker)
       runners = worker.fetch('runners') { raise "You must specify the number of runners" }
-      trace "Booting local worker" 
+      trace "Booting local worker"
       pipe = Hydra::Pipe.new
       child = SafeFork.fork do
         pipe.identify_as_child
         Hydra::Worker.new(:io => pipe, :runners => runners, :verbose => @verbose)
       end
+
       pipe.identify_as_parent
       @workers << { :pid => child, :io => pipe, :idle => false, :type => :local }
     end
@@ -162,11 +172,11 @@ module Hydra #:nodoc:
       sync = Sync.new(worker, @sync, @verbose)
 
       runners = worker.fetch('runners') { raise "You must specify the number of runners"  }
-      command = worker.fetch('command') { 
+      command = worker.fetch('command') {
         "RAILS_ENV=#{@environment} ruby -e \"require 'rubygems'; require 'hydra'; Hydra::Worker.new(:io => Hydra::Stdio.new, :runners => #{runners}, :verbose => #{@verbose});\""
       }
 
-      trace "Booting SSH worker" 
+      trace "Booting SSH worker"
       ssh = Hydra::SSH.new("#{sync.ssh_opts} #{sync.connect}", sync.remote_dir, command)
       return { :io => ssh, :idle => false, :type => :ssh, :connect => sync.connect }
     end
@@ -175,7 +185,7 @@ module Hydra #:nodoc:
       trace "Shutting down all workers"
       @workers.each do |worker|
         worker[:io].write(Shutdown.new) if worker[:io]
-        worker[:io].close if worker[:io] 
+        worker[:io].close if worker[:io]
       end
       @listeners.each{|t| t.exit}
     end
@@ -199,7 +209,7 @@ module Hydra #:nodoc:
               # if it exists and its for me.
               # SSH gives us back echoes, so we need to ignore our own messages
               if message and !message.class.to_s.index("Worker").nil?
-                message.handle(self, worker) 
+                message.handle(self, worker)
               end
             rescue IOError
               trace "lost Worker [#{worker.inspect}]"
@@ -208,7 +218,7 @@ module Hydra #:nodoc:
           end
         end
       end
-      
+
       @listeners.each{|l| l.join}
       @event_listeners.each{|l| l.testing_end}
     end

data/lib/hydra/message/worker_messages.rb

@@ -8,6 +8,12 @@ module Hydra #:nodoc:
         end
       end
 
+      class WorkerBegin < Hydra::Message
+        def handle(master, worker)
+          master.worker_begin(worker)
+        end
+      end
+
       # Message telling the Runner to run a file
       class RunFile < Hydra::Message
         # The file that should be run

data/lib/hydra/tasks.rb

@@ -40,7 +40,7 @@ module Hydra #:nodoc:
       return @config if File.exists?(@config)
       @config = nil
     end
-    
+
     # Add files to test by passing in a string to be run through Dir.glob.
     # For example:
     #
@@ -59,7 +59,7 @@ module Hydra #:nodoc:
   #     t.add_files 'test/integration/**/*_test.rb'
   #     t.verbose = false # optionally set to true for lots of debug messages
   #     t.autosort = false # disable automatic sorting based on runtime of tests
-  #   end  
+  #   end
   class TestTask < Hydra::Task
 
     # Create a new HydraTestTask
@@ -72,6 +72,12 @@ module Hydra #:nodoc:
 
       yield self if block_given?
 
+      if Object.const_defined?('RAILS_ENV') && RAILS_ENV == 'development'
+        $stderr.puts <<-MSG
+WARNING: RAILS_ENV is "development". Make sure to set it properly (ex: "RAILS_ENV=test rake hydra")
+        MSG
+      end
+
       # Ensure we override rspec's at_exit
       require 'hydra/spec/autorun_override'
 
@@ -302,7 +308,7 @@ module Hydra #:nodoc:
   #   Hydra::GlobalTask.new('db:reset')
   #
   # Allows you to run:
-  #   
+  #
   #   rake hydra:db:reset
   #
   # Then, db:reset will be run locally and on all remote workers. This
@@ -324,7 +330,7 @@ module Hydra #:nodoc:
     def define
       Hydra::RemoteTask.new(@name)
       desc "Run #{@name.to_s} Locally and Remotely across all Workers"
-      task "hydra:#{@name.to_s}" => [@name.to_s, "hydra:remote:#{@name.to_s}"] 
+      task "hydra:#{@name.to_s}" => [@name.to_s, "hydra:remote:#{@name.to_s}"]
     end
   end
 end

data/lib/hydra/worker.rb

@@ -9,6 +9,8 @@ module Hydra #:nodoc:
   class Worker
     include Hydra::Messages::Worker
     traceable('WORKER')
+
+    attr_reader :runners
     # Create a new worker.
     # * io: The IO object to use to communicate with the master
     # * num_runners: The number of runners to launch
@@ -19,14 +21,16 @@ module Hydra #:nodoc:
       @listeners = []
 
       boot_runners(opts.fetch(:runners) { 1 })
+      @io.write(Hydra::Messages::Worker::WorkerBegin.new)
+
       process_messages
-      
+
       @runners.each{|r| Process.wait r[:pid] }
     end
 
 
     # message handling methods
-    
+
     # When a runner wants a file, it hits this method with a message.
     # Then the worker bubbles the file request up to the master.
     def request_file(message, runner)
@@ -99,7 +103,7 @@ module Hydra #:nodoc:
           begin
             message = @io.gets
             if message and !message.class.to_s.index("Master").nil?
-              trace "Received Message from Master" 
+              trace "Received Message from Master"
               trace "\t#{message.inspect}"
               message.handle(self)
             else

data/test/worker_test.rb

@@ -41,8 +41,10 @@ class WorkerTest < Test::Unit::TestCase
 
     def request_a_file_and_verify_completion(pipe, num_runners)
       pipe.identify_as_parent
+      pipe.gets # grab the WorkerBegin
       num_runners.times do
-        assert pipe.gets.is_a?(Hydra::Messages::Worker::RequestFile)
+        response = pipe.gets # grab the RequestFile
+        assert response.is_a?(Hydra::Messages::Worker::RequestFile), "Expected RequestFile but got #{response.class.to_s}"
       end
       pipe.write(Hydra::Messages::Master::RunFile.new(:file => test_file))
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 19
-  - 0
-  version: 0.19.0
+  - 1
+  version: 0.19.1
 platform: ruby
 authors: 
 - Nick Gauthier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -04:00
+date: 2010-06-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -161,19 +161,19 @@ specification_version: 3
 summary: Distributed testing toolkit
 test_files: 
 - test/pipe_test.rb
-- test/test_helper.rb
+- test/sync_test.rb
 - test/ssh_test.rb
-- test/message_test.rb
-- test/master_test.rb
-- test/fixtures/write_file.rb
-- test/fixtures/slow.rb
-- test/fixtures/write_file_with_pending_spec.rb
-- test/fixtures/write_file_spec.rb
-- test/fixtures/features/step_definitions.rb
-- test/fixtures/hello_world.rb
 - test/fixtures/write_file_alternate_spec.rb
 - test/fixtures/sync_test.rb
+- test/fixtures/hello_world.rb
+- test/fixtures/features/step_definitions.rb
 - test/fixtures/assert_true.rb
+- test/fixtures/slow.rb
+- test/fixtures/write_file_spec.rb
+- test/fixtures/write_file_with_pending_spec.rb
+- test/fixtures/write_file.rb
+- test/message_test.rb
+- test/test_helper.rb
+- test/master_test.rb
 - test/runner_test.rb
-- test/sync_test.rb
 - test/worker_test.rb