test-queue 0.2.4 → 0.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDc5NzAzZGY0OGYwMGU4ZjkwZjI3NmIwODAwMmMyYjdmMzJjNzU0YQ==
+    MjQ3ZGNkZDQ3OGNjMWU2YmIxZDU2NGZjOTZjYTk5ZTNhY2E4NzQxZQ==
   data.tar.gz: !binary |-
-    ZTNiMWZhMDNmOTE2NDRkZmFjNWM5ZjY4YmU1OTExNjM1ZDc4NGNjOQ==
+    MjJiZjRjM2M4Y2E0ODA5ZjQyYTJkMDkzOTM0MjA0Nzc2NjM1NDg3ZA==
 SHA512:
   metadata.gz: !binary |-
-    MThiMzZlY2I1YzU4YzQ5YzNjYmVhZWVlYTQxOTJjNTJjZjk2NmE3YzE0ZWJm
-    MjhmMmQzZmQ2MmZlOGVhZTBmOWU5MWRhYTg0MTM5MDNmZmQxMzBhZGI3NmEw
-    MzVmYmQyZTJjN2QxODQ3MDEzNDg2OGNiODc4MDAwMTg3MjgxNzM=
+    MWYwODQ5NjBmMmEwMTNiYWFjZWQ1NGNmMTcyNjRiMWRhNDM4OWVkY2E3YTNi
+    NDViMTBjZDNjMGU1ZDc1MTNmYjIzYTMzNDViMzMyYmEyMjY1Mjk2MjFhYmIz
+    MTcxODg3NzA3MTI5MjkzMTc2MGRjMWNiNGIxOTNmYWFiMmI4MWE=
   data.tar.gz: !binary |-
-    MTBkYTYyNzgyNGI0MmE2YjNmZjI3ODU0NDliMzcyNTdlNThkZjM2NmI0ZWJj
-    N2ViYjI2NzliYTVkYmM4Y2I2MmIzM2FhNjVkYWI1MTYwNjA3NTBhODc4ODk0
-    Mzc1MGE5M2Q1MTdkNTQxYjg5YTA1NDA3ZmU3MzE1ZGMxMjcyYjU=
+    YzhhNTMxM2U3ZDNlNzg1YTcwY2Q4OTNiY2M1YTkwMmZlZTFhNjUzNTk5NzEw
+    MTk1YTNlZjZjYTcwMzhkNTM4MTQ5Yjg1ZjFjZWU4Y2MyOGY4MWFjNGRhOGZl
+    YTI2NWE5N2I2N2Y4MWVhMTEwZjA4ZWU0NjU0YWIwMGEzZjY1Njg=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.2.3)
+    test-queue (0.2.9)
 
 GEM
   remote: https://rubygems.org/

data/lib/test_queue/iterator.rb

@@ -27,7 +27,7 @@ module TestQueue
         if data = client.read(65536)
           client.close
           item = Marshal.load(data)
-          break if item.nil?
+          break if item.nil? || item.empty?
           suite = @suites[item]
 
           $0 = "#{@procline} - #{suite.respond_to?(:description) ? suite.description : suite}"

data/lib/test_queue/runner.rb

@@ -84,7 +84,7 @@ module TestQueue
         execute_parallel :
         execute_sequential
     ensure
-      summarize_internal
+      summarize_internal unless $!
     end
 
     def summarize_internal
@@ -144,6 +144,9 @@ module TestQueue
 
     def execute_parallel
       start_master
+      prepare(@concurrency)
+      @prepared_time = Time.now
+      start_relay if relay?
       spawn_workers
       distribute_queue
     ensure
@@ -154,21 +157,12 @@ module TestQueue
       end
 
       until @workers.empty?
-        cleanup_worker
+        reap_worker
       end
     end
 
     def start_master
-      if relay?
-        begin
-          sock = connect_to_relay
-          sock.puts("SLAVE #{@concurrency}")
-          sock.close
-        rescue Errno::ECONNREFUSED
-          STDERR.puts "*** Unable to connect to relay #{@relay}. Aborting.."
-          exit! 1
-        end
-      else
+      if !relay?
         if @socket =~ /^(?:(.+):)?(\d+)$/
           address = $1 || '0.0.0.0'
           port = $2.to_i
@@ -185,6 +179,17 @@ module TestQueue
       $0 = "#{desc} - #{@procline}"
     end
 
+    def start_relay
+      return unless relay?
+
+      sock = connect_to_relay
+      sock.puts("SLAVE #{@concurrency} #{Socket.gethostname}")
+      sock.close
+    rescue Errno::ECONNREFUSED
+      STDERR.puts "*** Unable to connect to relay #{@relay}. Aborting.."
+      exit! 1
+    end
+
     def stop_master
       return if relay?
 
@@ -194,8 +199,6 @@ module TestQueue
     end
 
     def spawn_workers
-      prepare(@concurrency)
-
       @concurrency.times do |i|
         num = i+1
 
@@ -204,7 +207,9 @@ module TestQueue
 
           iterator = Iterator.new(relay?? @relay : @socket, @suites, method(:around_filter))
           after_fork_internal(num, iterator)
-          exit! run_worker(iterator) || 0
+          ret = run_worker(iterator) || 0
+          cleanup_worker
+          exit! ret
         end
 
         @workers[pid] = Worker.new(pid, num)
@@ -222,7 +227,7 @@ module TestQueue
 
       $0 = "test-queue worker [#{num}]"
       puts
-      puts "==> Starting #$0 (#{Process.pid}) - iterating over #{iterator.sock}"
+      puts "==> Starting #$0 (#{Process.pid} on #{Socket.gethostname}) - iterating over #{iterator.sock}"
       puts
 
       after_fork(num)
@@ -246,6 +251,9 @@ module TestQueue
       return 0 # exit status
     end
 
+    def cleanup_worker
+    end
+
     def summarize_worker(worker)
       num_tests = ''
       failures = ''
@@ -253,7 +261,7 @@ module TestQueue
       [ num_tests, failures ]
     end
 
-    def cleanup_worker(blocking=true)
+    def reap_worker(blocking=true)
       if pid = Process.waitpid(-1, blocking ? 0 : Process::WNOHANG) and worker = @workers.delete(pid)
         worker.status = $?
         worker.end_time = Time.now
@@ -284,7 +292,7 @@ module TestQueue
 
       until @queue.empty? && remote_workers == 0
         if IO.select([@server], nil, nil, 0.1).nil?
-          cleanup_worker(false) # check for worker deaths
+          reap_worker(false) if @workers.any? # check for worker deaths
         else
           sock = @server.accept
           cmd = sock.gets.strip
@@ -294,10 +302,11 @@ module TestQueue
               data = Marshal.dump(obj.to_s)
               sock.write(data)
             end
-          when /^SLAVE (\d+)/
+          when /^SLAVE (\d+) ([\w\.-]+)/
             num = $1.to_i
+            slave = $2
             remote_workers += num
-            STDERR.puts "*** slave connected with additional #{num} workers"
+            STDERR.puts "*** #{num} workers connected from #{slave} after #{Time.now-@start_time}s"
           when /^WORKER (\d+)/
             data = sock.read($1.to_i)
             worker = Marshal.load(data)
@@ -311,7 +320,7 @@ module TestQueue
       stop_master
 
       until @workers.empty?
-        cleanup_worker
+        reap_worker
       end
     end
 

data/test-multi.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 set -x
 
+# export TEST_QUEUE_VERBOSE=1
 TEST_QUEUE_SOCKET=0.0.0.0:12345 bundle exec minitest-queue ./test/sample_test.rb &
 sleep 0.1
 TEST_QUEUE_RELAY=0.0.0.0:12345  bundle exec minitest-queue ./test/sample_test.rb

data/test-queue.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'test-queue'
-  s.version = '0.2.4'
+  s.version = '0.2.9'
   s.summary = 'parallel test runner'
   s.description = 'minitest/rspec parallel test runner for CI environments'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-queue
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.9
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec