test-queue 0.2.13 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fbdc02f98f8e6e07a67693e13a244f5d50f5b6e5
+  data.tar.gz: 377d47b3e6b54fd3bbcb5d526d749480df6265dc
+SHA512:
+  metadata.gz: 6bc6bc66ba5d4e4fe5a5a7c6a19522f0cf5dc1e3d044d33c9b462b36ad01097cdbaf133102f53bc61e0559bb33419574a10f4d17af0e20449b80a346eeb36440
+  data.tar.gz: 90885077e4c321b0f7c576b3ff7814e46aa43a98e7fb723cfbd770a2874f7655639cc5d4e8e1e943247779a31d092941303a03ebd8b3e886197ffbb09cd44033

data/.gitignore

@@ -0,0 +1 @@
+.test_queue_stats

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+install: script/bootstrap
+rvm:
+  - 2.2
+env:
+  - SUITE=ruby
+  - SUITE=cucumber1-3
+  - SUITE=cucumber2-4
+  - SUITE=minitest4
+  - SUITE=minitest5
+  - SUITE=rspec2-1
+  - SUITE=rspec3-0
+  - SUITE=rspec3-1
+  - SUITE=rspec3-2
+  - SUITE=testunit
+script: script/cibuild
+notifications:
+  email: false

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 gemspec
 gem 'minitest', '5.3.3'
+gem 'rspec', '>= 2.13', '< 4.0'
+gem 'cucumber', '~> 1.3.10'

data/Gemfile-cucumber1-3

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec
+gem 'cucumber', '~> 1.3.10'
+gem 'rspec-expectations', '~> 2.14.4'

data/Gemfile-cucumber1-3.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: .
+  specs:
+    test-queue (0.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    cucumber (1.3.20)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    diff-lcs (1.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    multi_json (1.12.1)
+    multi_test (0.1.2)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber (~> 1.3.10)
+  rspec-expectations (~> 2.14.4)
+  test-queue!
+
+BUNDLED WITH
+   1.13.1

data/Gemfile-cucumber2-4

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec
+gem 'cucumber', '2.4.0'
+gem 'rspec-expectations', '2.14.4'

data/Gemfile-cucumber2-4.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: .
+  specs:
+    test-queue (0.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    cucumber (2.4.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 4.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
+    cucumber-wire (0.0.1)
+    diff-lcs (1.2.5)
+    gherkin (4.0.0)
+    multi_json (1.12.1)
+    multi_test (0.1.2)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber (= 2.4.0)
+  rspec-expectations (= 2.14.4)
+  test-queue!
+
+BUNDLED WITH
+   1.13.1

data/Gemfile-minitest4.lock

@@ -1,38 +1,19 @@
 PATH
   remote: .
   specs:
-    test-queue (0.2.13)
+    test-queue (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.2)
-    cucumber (1.3.15)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    diff-lcs (1.2.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
     minitest (4.7.3)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.1)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber (~> 1.3.10)
   minitest (= 4.7.3)
-  rspec (>= 2.13, < 4.0)
   test-queue!
+
+BUNDLED WITH
+   1.13.1

data/Gemfile-minitest5

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gemspec
+gem 'minitest', '5.3.3'

data/Gemfile-minitest5.lock

@@ -0,0 +1,19 @@
+PATH
+  remote: .
+  specs:
+    test-queue (0.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    minitest (5.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  minitest (= 5.3.3)
+  test-queue!
+
+BUNDLED WITH
+   1.13.1

data/Gemfile-rspec2-1

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gemspec
+gem 'rspec', '2.13.0'

data/Gemfile-rspec2-1.lock

@@ -0,0 +1,27 @@
+PATH
+  remote: .
+  specs:
+    test-queue (0.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec (= 2.13.0)
+  test-queue!
+
+BUNDLED WITH
+   1.13.1

data/Gemfile-rspec3-0.lock

@@ -1,23 +1,12 @@
 PATH
   remote: .
   specs:
-    test-queue (0.2.12)
+    test-queue (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.2)
-    cucumber (1.3.19)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
     diff-lcs (1.2.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    multi_json (1.11.0)
-    multi_test (0.1.2)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
@@ -35,6 +24,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber (~> 1.3.10)
   rspec (~> 3.0.0)
   test-queue!
+
+BUNDLED WITH
+   1.13.1

data/Gemfile-rspec3-1.lock

@@ -1,23 +1,12 @@
 PATH
   remote: .
   specs:
-    test-queue (0.2.12)
+    test-queue (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.2)
-    cucumber (1.3.19)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
     diff-lcs (1.2.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    multi_json (1.11.0)
-    multi_test (0.1.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -35,6 +24,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber (~> 1.3.10)
   rspec (~> 3.1.0)
   test-queue!
+
+BUNDLED WITH
+   1.13.1

data/Gemfile-rspec3-2.lock

@@ -1,23 +1,12 @@
 PATH
   remote: .
   specs:
-    test-queue (0.2.12)
+    test-queue (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.2)
-    cucumber (1.3.19)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
     diff-lcs (1.2.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    multi_json (1.11.0)
-    multi_test (0.1.2)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -36,6 +25,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber (~> 1.3.10)
   rspec (~> 3.2.0)
   test-queue!
+
+BUNDLED WITH
+   1.13.1

data/Gemfile-testunit.lock

@@ -1,36 +1,12 @@
 PATH
   remote: .
   specs:
-    test-queue (0.2.13)
+    test-queue (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.2)
-    cucumber (1.3.18)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    diff-lcs (1.2.5)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
     power_assert (0.2.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
     test-unit (3.0.8)
       power_assert
 
@@ -38,7 +14,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber (~> 1.3.10)
-  rspec (>= 2.13, < 4.0)
   test-queue!
   test-unit (= 3.0.8)
+
+BUNDLED WITH
+   1.13.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.2.13)
+    test-queue (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -36,3 +36,6 @@ DEPENDENCIES
   minitest (= 5.3.3)
   rspec (>= 2.13, < 4.0)
   test-queue!
+
+BUNDLED WITH
+   1.13.1

data/README.md

@@ -1,5 +1,8 @@
 ## test-queue
 
+[![Gem Version](https://badge.fury.io/rb/test-queue.svg)](https://rubygems.org/gems/test-queue)
+[![Build Status](https://travis-ci.org/tmm1/test-queue.svg?branch=master)](https://travis-ci.org/tmm1/test-queue)
+
 Yet another parallel test runner, built using a centralized queue to ensure
 optimal distribution of tests between workers.
 
@@ -35,6 +38,7 @@ the workload and relay results back to a central master.
 - `TEST_QUEUE_RELAY_TIMEOUT`: when using remote workers, the amount of time a worker will try to reconnect to start work
 - `TEST_QUEUE_RELAY_TOKEN`: when using remote workers, this must be the same on both workers and the server for remote workers to run tests.
 - `TEST_QUEUE_SLAVE_MESSAGE`: when using remote workers, set this on a slave worker and it will appear on the slave's connection message on the master.
+- `TEST_QUEUE_SPLIT_GROUPS`: split tests up by example rather than example group. Faster for tests with short setup time such as selenium. RSpec only. Add the :no_split tag to ExampleGroups you don't want split.
 
 ### usage
 

data/bin/minitest-queue

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 require 'test_queue'
 require 'test_queue/runner/minitest'
-ARGV.each{ |f| require(f) }
 TestQueue::Runner::MiniTest.new.execute

data/bin/testunit-queue

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 require 'test_queue'
 require 'test_queue/runner/testunit'
-ARGV.each{ |f| require(f) }
 TestQueue::Runner::TestUnit.new.execute

data/lib/test_queue/iterator.rb

@@ -1,34 +1,53 @@
 module TestQueue
   class Iterator
-    attr_reader :stats, :sock
+    attr_reader :sock
 
-    def initialize(sock, suites, filter=nil)
+    def initialize(test_framework, sock, filter=nil, early_failure_limit: nil)
+      @test_framework = test_framework
       @done = false
-      @stats = {}
+      @suite_stats = []
       @procline = $0
       @sock = sock
-      @suites = suites
       @filter = filter
       if @sock =~ /^(.+):(\d+)$/
         @tcp_address = $1
         @tcp_port = $2.to_i
       end
+      @failures = 0
+      @early_failure_limit = early_failure_limit
     end
 
     def each
       fail "already used this iterator. previous caller: #@done" if @done
 
       while true
-        client = connect_to_master('POP')
+        # If we've hit too many failures in one worker, assume the entire
+        # test suite is broken, and notify master so the run
+        # can be immediately halted.
+        if @early_failure_limit && @failures >= @early_failure_limit
+          connect_to_master("KABOOM")
+          break
+        else
+          client = connect_to_master('POP')
+        end
         break if client.nil?
-        r, w, e = IO.select([client], nil, [client], nil)
+        _r, _w, e = IO.select([client], nil, [client], nil)
         break if !e.empty?
 
         if data = client.read(65536)
           client.close
           item = Marshal.load(data)
           break if item.nil? || item.empty?
-          suite = @suites[item]
+          if item == "WAIT"
+            $0 = "#{@procline} - Waiting for work"
+            sleep 0.1
+            next
+          end
+          suite_name, path = item
+          suite = load_suite(suite_name, path)
+
+          # Maybe we were told to load a suite that doesn't exist anymore.
+          next unless suite
 
           $0 = "#{@procline} - #{suite.respond_to?(:description) ? suite.description : suite}"
           start = Time.now
@@ -37,7 +56,8 @@ module TestQueue
           else
             yield suite
           end
-          @stats[suite.to_s] = Time.now - start
+          @suite_stats << TestQueue::Stats::Suite.new(suite_name, path, Time.now - start, Time.now)
+          @failures += suite.failure_count if suite.respond_to? :failure_count
         else
           break
         end
@@ -45,8 +65,8 @@ module TestQueue
     rescue Errno::ENOENT, Errno::ECONNRESET, Errno::ECONNREFUSED
     ensure
       @done = caller.first
-      File.open("/tmp/test_queue_worker_#{$$}_stats", "wb") do |f|
-        f.write Marshal.dump(@stats)
+      File.open("/tmp/test_queue_worker_#{$$}_suites", "wb") do |f|
+        Marshal.dump(@suite_stats, f)
       end
     end
 
@@ -68,5 +88,16 @@ module TestQueue
     def empty?
       false
     end
+
+    def load_suite(suite_name, path)
+      @loaded_suites ||= {}
+      suite = @loaded_suites[suite_name]
+      return suite if suite
+
+      @test_framework.suites_from_file(path).each do |name, suite|
+        @loaded_suites[name] = suite
+      end
+      @loaded_suites[suite_name]
+    end
   end
 end