test-queue 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c32b025eec2391d8523ce84f4f180443b09f003f8770b8b27ff741aac464629
-  data.tar.gz: 6a18a116cba1ec57617f92405a5d4554dab34dc5ab41be6ed10825b9c8b9f503
+  metadata.gz: f689a4cffa234a32b4e3919fe2f263258cd32682925c29d59e26fdd0a8218236
+  data.tar.gz: 5e2f51214fa2dfcc184386fc588767f7ce15ac9738de0a3c8a730aed33995669
 SHA512:
-  metadata.gz: c7be91c62fc0e8f47826b441ed36f08ce454caf53bb56af03b11a3f7ed0eb88028ecb7ec96b03baf413ef985401292fee055561e876012c88e7e63fc7007ae00
-  data.tar.gz: 27e6d8fbaf61bf96beede058ad5a25ae8695a88fb3ce3d14ba96666e8da2b1df066574aa7efa0f9bcd5cbd619d1825a0a8c4f4cbe20f0eb312b2f9692f7a3d49
+  metadata.gz: 1f76dbac0466294ffca4a780f7c411611cba1c55006a22343bdc11d789e400b135d4457c889d591498ede4ec92dd12ce615239f3569667b061117729e2e61fbc
+  data.tar.gz: a9666ce78f35e7d1a4cf3f877782ef86b7909396fb12f27c6df883f483ff07907db6b3a9ced68c2f36eae55b2d3f28c9ed3699df3b4ed9a1fc9151b9147306a8

data/.github/workflows/test.yml

@@ -0,0 +1,93 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  main:
+    name: >-
+      ${{ matrix.ruby }} ${{ matrix.entry.name }}
+    runs-on: ${{ matrix.os }}-latest
+    env:
+      TEST_QUEUE_WORKERS: 2
+      TEST_QUEUE_VERBOSE: 1
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu]
+        # Lowest and Latest version.
+        ruby: ['2.7', '3.2']
+        entry:
+          - { name: cucumber1_3, bats: test/cucumber.bats }
+          - { name: cucumber2_4, bats: test/cucumber.bats }
+          - { name: minitest4, bats: test/minitest4.bats }
+          - { name: minitest5, bats: test/minitest5.bats }
+          - { name: rspec3, bats: test/rspec3.bats }
+          - { name: testunit, bats: test/testunit.bats }
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: install dependencies
+        run: bundle install --jobs 3 --retry 3
+      - name: setup for Bats
+        run: bundle exec rake setup
+      - name: spec
+        run: bundle exec rake spec
+      - name: install dependencies for ${{ matrix.entry.name }}
+        run: BUNDLE_GEMFILE=gemfiles/${{ matrix.entry.name }}.gemfile bundle install --jobs 3 --retry 3
+      - name: test
+        run: BUNDLE_GEMFILE=gemfiles/${{ matrix.entry.name }}.gemfile vendor/bats/bin/bats ${{ matrix.entry.bats }}
+
+  # RSpec 2 doesn't work with Ruby 3.2:
+  #
+  #   /opt/hostedtoolcache/Ruby/3.2.1/x64/lib/ruby/gems/3.2.0/gems/rspec-core-2.99.2/lib/rspec/core/ruby_project.rb:27:
+  #   in `block in find_first_parent_containing': undefined method `exists?' for File:Class (NoMethodError)
+  #
+  #           ascend_until {|path| File.exists?(File.join(path, dir))}
+  #                                    ^^^^^^^^
+  #   Did you mean?  exist?
+  #
+  # Up to Ruby 3.1 is the supported version for RSpec 2.
+  rspec2:
+    name: >-
+      ${{ matrix.ruby }} ${{ matrix.entry.name }}
+    runs-on: ${{ matrix.os }}-latest
+    env:
+      TEST_QUEUE_WORKERS: 2
+      TEST_QUEUE_VERBOSE: 1
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu]
+        # Lowest and Latest version.
+        ruby: ['2.7', '3.1']
+        entry:
+          - { name: rspec2, bats: test/rspec2.bats }
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: install dependencies
+        run: bundle install --jobs 3 --retry 3
+      - name: setup for Bats
+        run: bundle exec rake setup
+      - name: spec
+        run: bundle exec rake spec
+      - name: install dependencies for ${{ matrix.entry.name }}
+        run: BUNDLE_GEMFILE=gemfiles/${{ matrix.entry.name }}.gemfile bundle install --jobs 3 --retry 3
+      - name: test
+        run: BUNDLE_GEMFILE=gemfiles/${{ matrix.entry.name }}.gemfile vendor/bats/bin/bats ${{ matrix.entry.bats }}

data/.gitignore

@@ -1 +1,6 @@
 .test_queue_stats
+.ruby-version
+Gemfile.lock
+gemfiles/.bundle/
+*.gemfile.lock
+vendor

data/Appraisals

@@ -0,0 +1,35 @@
+appraise "cucumber1-3" do
+  gem 'cucumber', '~> 1.3.10'
+  # Pin Rake version to Prevent `NoMethodError: undefined method `last_comment'`.
+  gem 'rake', '< 11.0'
+end
+
+appraise "cucumber2-4" do
+  gem 'cucumber', '~> 2.4.0'
+  # Pin Rake version to Prevent `NoMethodError: undefined method `last_comment'`.
+  gem 'rake', '< 11.0'
+end
+
+appraise "minitest4" do
+  gem 'rake'
+  gem 'minitest', '~> 4.7'
+end
+
+appraise "minitest5" do
+  gem 'rake'
+  gem 'minitest', '5.10.0'
+end
+
+appraise "rspec2" do
+  # Pin Rake version to Prevent `NoMethodError: undefined method `last_comment'`.
+  gem 'rake', '< 11.0'
+  gem 'rspec', '~> 2.99'
+end
+
+appraise "rspec3" do
+  gem 'rspec', '~> 3.12'
+end
+
+appraise "testunit" do
+  gem 'test-unit'
+end

data/Gemfile

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

data/README.md

@@ -1,7 +1,7 @@
-## test-queue
+# 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)
+[![CI](https://github.com/tmm1/test-queue/actions/workflows/test.yml/badge.svg)](https://github.com/tmm1/test-queue/actions/workflows/test.yml)
 
 Yet another parallel test runner, built using a centralized queue to ensure
 optimal distribution of tests between workers.
@@ -10,13 +10,13 @@ Specifically optimized for CI environments: build statistics from each run
 are stored locally and used to sort the queue at the beginning of the
 next run.
 
-### design
+## Design
 
 test-queue uses a simple master + pre-fork worker model. The master
 exposes a unix domain socket server which workers use to grab tests off
 the queue.
 
-```
+```console
 ─┬─ 21232 minitest-queue master
  ├─── 21571 minitest-queue worker [3] - AuthenticationTest
  ├─── 21568 minitest-queue worker [2] - ApiTest
@@ -27,7 +27,7 @@ the queue.
 test-queue also has a distributed mode, where additional masters can share
 the workload and relay results back to a central master.
 
-### environment variables
+## Environment variables
 
 - `TEST_QUEUE_WORKERS`: number of workers to use per master (default: all available cores)
 - `TEST_QUEUE_VERBOSE`: show results as they are available (default: `0`)
@@ -40,11 +40,11 @@ the workload and relay results back to a central master.
 - `TEST_QUEUE_REMOTE_MASTER_MESSAGE`: when using distributed builds, set this on a remote master and it will appear in that master's connection message on the central 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
+## Usage
 
 test-queue bundles `testunit-queue`, `minitest-queue` and `rspec-queue` binaries which can be used directly:
 
-```
+```console
 $ minitest-queue $(find test/ -name \*_test.rb)
 $ rspec-queue --format progress spec
 ```
@@ -53,7 +53,7 @@ But the underlying `TestQueue::Runner::TestUnit`, `TestQueue::Runner::MiniTest`
 built to be subclassed by your application. I recommend checking a new
 executable into your project using one of these superclasses.
 
-```
+```console
 $ vim script/test-queue
 $ chmod +x script/test-queue
 $ git add script/test-queue
@@ -69,7 +69,7 @@ runner to reset any global state.
 class MyAppTestRunner < TestQueue::Runner::MiniTest
   def after_fork(num)
     # use separate mysql database (we assume it exists and has the right schema already)
-    ActiveRecord::Base.configurations['test']['database'] << num.to_s
+    ActiveRecord::Base.configurations.configs_for(env_name: 'test', name: 'primary').database << num.to_s
     ActiveRecord::Base.establish_connection(:test)
 
     # use separate redis database
@@ -97,13 +97,13 @@ end
 MyAppTestRunner.new.execute
 ```
 
-### distributed mode
+## Distributed mode
 
 To use distributed mode, the central master must listen on a tcp port. Additional masters can be booted
-in relay mode to connect to the central master. Remote masters must provide a TEST_QUEUE_RELAY_TOKEN
+in relay mode to connect to the central master. Remote masters must provide a `TEST_QUEUE_RELAY_TOKEN`
 to match the central master's.
 
-```
+```console
 $ TEST_QUEUE_RELAY_TOKEN=123 TEST_QUEUE_SOCKET=0.0.0.0:12345 bundle exec minitest-queue ./test/sample_test.rb
 $ TEST_QUEUE_RELAY_TOKEN=123 TEST_QUEUE_RELAY=0.0.0.0:12345  bundle exec minitest-queue ./test/sample_test.rb
 $ TEST_QUEUE_RELAY_TOKEN=123 ./test-multi.sh
@@ -112,7 +112,7 @@ $ TEST_QUEUE_RELAY_TOKEN=123 ./test-multi.sh
 See the [Parameterized Trigger Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Parameterized+Trigger+Plugin)
 for a simple way to do this with jenkins.
 
-### see also
+## See also
 
   * https://github.com/Shopify/rails_parallel
   * https://github.com/grosser/parallel_tests

data/Rakefile

@@ -0,0 +1,14 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:setup, :spec, :feature]
+
+task :setup do
+  sh 'script/bootstrap' unless File.exist?("#{Dir.pwd}/vendor/bats/bin/bats")
+end
+
+task :feature do
+  sh 'TEST_QUEUE_WORKERS=2 TEST_QUEUE_VERBOSE=1 vendor/bats/bin/bats test'
+end

data/{bin → exe}/cucumber-queue

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
 require 'test_queue'
 require 'test_queue/runner/cucumber'
+
 TestQueue::Runner::Cucumber.new.execute

data/{bin → exe}/minitest-queue

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
 require 'test_queue'
 require 'test_queue/runner/minitest'
+
 TestQueue::Runner::MiniTest.new.execute

data/{bin → exe}/rspec-queue

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
 require 'test_queue'
 require 'test_queue/runner/rspec'
+
 TestQueue::Runner::RSpec.new.execute

data/{bin → exe}/testunit-queue

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
 require 'test_queue'
 require 'test_queue/runner/testunit'
+
 TestQueue::Runner::TestUnit.new.execute

data/gemfiles/cucumber1_3.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "< 11.0"
+gem "rspec", ">= 2.13", "< 4.0"
+gem "cucumber", "~> 1.3.10"
+
+gemspec path: "../"

data/gemfiles/cucumber2_4.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "< 11.0"
+gem "rspec", ">= 2.13", "< 4.0"
+gem "cucumber", "~> 2.4.0"
+
+gemspec path: "../"

data/gemfiles/minitest4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "minitest", "~> 4.7"
+
+gemspec path: "../"

data/gemfiles/minitest5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "minitest", "5.10.0"
+
+gemspec path: "../"

data/gemfiles/rspec2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "< 11.0"
+gem "rspec", "~> 2.99"
+
+gemspec path: "../"

data/gemfiles/rspec3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rspec", "~> 3.12"
+
+gemspec path: "../"

data/gemfiles/testunit.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "test-unit"
+
+gemspec path: "../"

data/lib/test-queue.rb

@@ -1 +1 @@
-require 'test_queue'
+require_relative 'test_queue'

data/lib/test_queue/runner/minitest.rb

@@ -1,9 +1,9 @@
 begin
   require 'minitest'
-  require 'test_queue/runner/minitest5'
+  require_relative '../runner/minitest5'
 rescue LoadError => e
   require 'minitest/unit'
-  require 'test_queue/runner/minitest4'
+  require_relative '../runner/minitest4'
 end
 
 module TestQueue

data/lib/test_queue/runner/minitest4.rb

@@ -1,4 +1,4 @@
-require 'test_queue/runner'
+require_relative '../runner'
 require 'set'
 require 'stringio'
 

data/lib/test_queue/runner/minitest5.rb

@@ -1,4 +1,4 @@
-require 'test_queue/runner'
+require_relative '../runner'
 
 module MiniTest
   def self.__run reporter, options
@@ -56,6 +56,13 @@ module TestQueue
   class Runner
     class MiniTest < Runner
       def initialize
+        options = Minitest.process_args ARGV
+
+        if Minitest.respond_to?(:seed)
+          Minitest.seed = options[:seed]
+          srand Minitest.seed
+        end
+
         if ::MiniTest::Test.runnables.any? { |r| r.runnable_methods.any? }
           fail "Do not `require` test files. Pass them via ARGV instead and they will be required as needed."
         end

data/lib/test_queue/runner/puppet_lint.rb

@@ -1,4 +1,4 @@
-require 'test_queue'
+require_relative '../../test_queue'
 require 'puppet-lint'
 
 module TestQueue

data/lib/test_queue/runner/rspec.rb

@@ -1,4 +1,4 @@
-require 'test_queue/runner'
+require_relative '../runner'
 require 'rspec/core'
 
 case ::RSpec::Core::Version::STRING.to_i
@@ -36,6 +36,11 @@ module TestQueue
         options.parse_options if options.respond_to?(:parse_options)
         options.configure(::RSpec.configuration)
 
+        if ::RSpec.configuration.instance_variable_defined?(:@files_or_directories_to_run) &&
+           ::RSpec.configuration.instance_variable_get(:@files_or_directories_to_run).empty?
+          ::RSpec.configuration.instance_variable_set(:@files_or_directories_to_run, [::RSpec.configuration.default_path])
+        end
+
         ::RSpec.configuration.files_to_run.uniq
       end
 

data/lib/test_queue/runner/sample.rb

@@ -1,5 +1,5 @@
-require 'test_queue'
-require 'test_queue/runner'
+require_relative '../../test_queue'
+require_relative '../runner'
 
 module TestQueue
   class Runner

data/lib/test_queue/runner/testunit.rb

@@ -1,4 +1,4 @@
-require 'test_queue/runner'
+require_relative '../runner'
 
 gem 'test-unit'
 require 'test/unit'

data/lib/test_queue/runner.rb

@@ -2,8 +2,8 @@ require 'set'
 require 'socket'
 require 'fileutils'
 require 'securerandom'
-require 'test_queue/stats'
-require 'test_queue/test_framework'
+require_relative 'stats'
+require_relative 'test_framework'
 
 module TestQueue
   class Worker
@@ -48,12 +48,12 @@ module TestQueue
 
       @procline = $0
 
-      @whitelist = if forced = ENV['TEST_QUEUE_FORCE']
+      @allowlist = if forced = ENV['TEST_QUEUE_FORCE']
                      forced.split(/\s*,\s*/)
                    else
                      []
                    end
-      @whitelist.freeze
+      @allowlist.freeze
 
       all_files = @test_framework.all_suite_files.to_set
       @queue = @stats.all_suites
@@ -61,12 +61,12 @@ module TestQueue
         .sort_by { |suite| -suite.duration }
         .map { |suite| [suite.name, suite.path] }
 
-      if @whitelist.any?
-        @queue.select! { |suite_name, path| @whitelist.include?(suite_name) }
-        @queue.sort_by! { |suite_name, path| @whitelist.index(suite_name) }
+      if @allowlist.any?
+        @queue.select! { |suite_name, path| @allowlist.include?(suite_name) }
+        @queue.sort_by! { |suite_name, path| @allowlist.index(suite_name) }
       end
 
-      @awaited_suites = Set.new(@whitelist)
+      @awaited_suites = Set.new(@allowlist)
       @original_queue = Set.new(@queue).freeze
 
       @workers = {}
@@ -318,9 +318,9 @@ module TestQueue
       # distributes them to remote masters.
       return if relay?
 
-      # No need to discover suites if all whitelisted suites are already
+      # No need to discover suites if all allowlisted suites are already
       # queued.
-      return if @whitelist.any? && @awaited_suites.empty?
+      return if @allowlist.any? && @awaited_suites.empty?
 
       @discovering_suites_pid = fork do
         terminate = false
@@ -346,7 +346,7 @@ module TestQueue
     def awaiting_suites?
       case
       when @awaited_suites.any?
-        # We're waiting to find all the whitelisted suites so we can run them
+        # We're waiting to find all the allowlisted suites so we can run them
         # in the correct order.
         true
       when @queue.empty? && !!@discovering_suites_pid
@@ -359,7 +359,7 @@ module TestQueue
     end
 
     def enqueue_discovered_suite(suite_name, path)
-      if @whitelist.any? && !@whitelist.include?(suite_name)
+      if @allowlist.any? && !@allowlist.include?(suite_name)
         return
       end
 
@@ -377,9 +377,9 @@ module TestQueue
       @queue.unshift [suite_name, path]
 
       if @awaited_suites.delete?(suite_name) && @awaited_suites.empty?
-        # We've found all the whitelisted suites. Sort the queue to match the
-        # whitelist.
-        @queue.sort_by! { |suite_name, path| @whitelist.index(suite_name) }
+        # We've found all the allowlisted suites. Sort the queue to match the
+        # allowlist.
+        @queue.sort_by! { |suite_name, path| @allowlist.index(suite_name) }
 
         kill_suite_discovery_process("INT")
       end

data/lib/test_queue.rb

@@ -4,5 +4,5 @@ if !IO.respond_to?(:binread)
   end
 end
 
-require 'test_queue/iterator'
-require 'test_queue/runner'
+require_relative 'test_queue/iterator'
+require_relative 'test_queue/runner'

data/script/bootstrap

@@ -10,3 +10,4 @@ mkdir tmp
 mkdir -p vendor/bats
 curl --silent --location --show-error https://github.com/sstephenson/bats/archive/v0.4.0.tar.gz | tar -xz -C tmp
 tmp/bats-0.4.0/install.sh "$ROOT/vendor/bats"
+rm -rf tmp

data/spec/stats_spec.rb

@@ -1,5 +1,8 @@
 require "fileutils"
 require "tempfile"
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
 require "test_queue/stats"
 
 RSpec.describe TestQueue::Stats do

data/test/minitest4.bats

@@ -1,7 +1,7 @@
 load "testlib"
 
 setup() {
-  require_gem "minitest" ">= 4.0"
+  require_gem "minitest" "~> 4.0"
 }
 
 @test "minitest-queue succeeds when all tests pass" {

data/test/minitest5.bats

@@ -3,7 +3,7 @@ load "testlib"
 SCRATCH=tmp/minitest5-tests
 
 setup() {
-  require_gem "minitest" ">= 5.0"
+  require_gem "minitest" "~> 5.0"
   rm -rf $SCRATCH
   mkdir -p $SCRATCH
 }
@@ -27,12 +27,12 @@ teardown() {
   assert_output_contains "MiniTestFailure#test_fail"
 }
 
-@test "TEST_QUEUE_FORCE whitelists certain tests" {
-  export TEST_QUEUE_WORKERS=1 TEST_QUEUE_FORCE="MiniTestSleep21,MiniTestSleep8"
+@test "TEST_QUEUE_FORCE allowlists certain tests" {
+  export TEST_QUEUE_WORKERS=1 TEST_QUEUE_FORCE="MiniTestSleep11,MiniTestSleep8"
   run bundle exec minitest-queue ./test/samples/*_minitest5.rb
   assert_status 0
   assert_output_contains "Starting test-queue master"
-  assert_output_contains "MiniTestSleep21"
+  assert_output_contains "MiniTestSleep11"
   assert_output_contains "MiniTestSleep8"
   refute_output_contains "MiniTestSleep9"
 }
@@ -68,7 +68,7 @@ assert_test_queue_force_ordering() {
 }
 
 @test "minitest-queue fails if TEST_QUEUE_FORCE specifies nonexistent tests" {
-  export TEST_QUEUE_WORKERS=1 TEST_QUEUE_FORCE="MiniTestSleep21,DoesNotExist"
+  export TEST_QUEUE_WORKERS=1 TEST_QUEUE_FORCE="MiniTestSleep11,DoesNotExist"
   run bundle exec minitest-queue ./test/samples/*_minitest5.rb
   assert_status 1
   assert_output_contains "Failed to discover DoesNotExist specified in TEST_QUEUE_FORCE"

data/test/{rspec.bats → rspec2.bats}

@@ -1,7 +1,7 @@
 load "testlib"
 
 setup() {
-  require_gem "rspec" ">= 2.0"
+  require_gem "rspec" "~> 2.0"
 }
 
 @test "rspec-queue succeeds when all specs pass" {
@@ -15,7 +15,9 @@ setup() {
   run bundle exec rspec-queue ./test/samples/sample_spec.rb
   assert_status 1
   assert_output_contains "1) RSpecFailure fails"
-  assert_output_contains "Failure/Error: expect(:foo).to eq :bar"
+  assert_output_contains "RSpecFailure fails"
+  assert_output_contains "expected: :bar"
+  assert_output_contains "got: :foo"
 }
 
 @test "TEST_QUEUE_SPLIT_GROUPS splits splittable groups" {
@@ -41,6 +43,4 @@ setup() {
   run bundle exec rspec-queue ./test/samples/sample_use_shared_example1_spec.rb \
                               ./test/samples/sample_use_shared_example2_spec.rb
   assert_status 0
-
 }
-

data/test/rspec3.bats

@@ -0,0 +1,56 @@
+load "testlib"
+
+setup() {
+  require_gem "rspec" "~> 3.0"
+}
+
+@test "rspec-queue succeeds when all specs pass" {
+  run bundle exec rspec-queue ./test/samples/sample_spec.rb
+  assert_status 0
+  assert_output_contains "Starting test-queue master"
+  assert_output_contains "16 examples, 0 failures"
+  assert_output_contains "16 examples, 0 failures"
+}
+
+@test "rspec-queue succeeds all specs pass in the default spec directory even if directory path is omitted" {
+  run bundle exec rspec-queue
+  assert_status 0
+  assert_output_contains "Starting test-queue master"
+  assert_output_contains "6 examples, 0 failures"
+  assert_output_contains "0 examples, 0 failures"
+}
+
+@test "rspec-queue fails when a spec fails" {
+  export FAIL=1
+  run bundle exec rspec-queue ./test/samples/sample_spec.rb
+  assert_status 1
+  assert_output_contains "1) RSpecFailure fails"
+  assert_output_contains "RSpecFailure fails"
+  assert_output_contains "expected: :bar"
+  assert_output_contains "got: :foo"
+}
+
+@test "TEST_QUEUE_SPLIT_GROUPS splits splittable groups" {
+  export TEST_QUEUE_SPLIT_GROUPS=true
+  run bundle exec rspec-queue ./test/samples/sample_split_spec.rb
+  assert_status 0
+
+  assert_output_matches '\[ 1\] +1 example, 0 failures'
+  assert_output_matches '\[ 2\] +1 example, 0 failures'
+}
+
+@test "TEST_QUEUE_SPLIT_GROUPS does not split unsplittable groups" {
+  export TEST_QUEUE_SPLIT_GROUPS=true
+  export NOSPLIT=1
+  run bundle exec rspec-queue ./test/samples/sample_split_spec.rb
+  assert_status 0
+
+  assert_output_contains "2 examples, 0 failures"
+  assert_output_contains "0 examples, 0 failures"
+}
+
+@test "rspec-queue supports shared example groups" {
+  run bundle exec rspec-queue ./test/samples/sample_use_shared_example1_spec.rb \
+                              ./test/samples/sample_use_shared_example2_spec.rb
+  assert_status 0
+}

data/test/sleepy_runner.rb

@@ -1,9 +1,11 @@
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
 require 'test_queue'
 require 'test_queue/runner/minitest'
 
 class SleepyTestRunner < TestQueue::Runner::MiniTest
   def after_fork(num)
-    if ENV['SLEEP_AS_RELAY'] && relay? 
+    if ENV['SLEEP_AS_RELAY'] && relay?
       sleep 5
     elsif ENV['SLEEP_AS_MASTER'] && !relay?
       sleep 5

data/test-queue.gemspec

@@ -1,6 +1,7 @@
-spec = Gem::Specification.new do |s|
+Gem::Specification.new do |s|
   s.name = 'test-queue'
-  s.version = '0.5.0'
+  s.version = '0.6.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.summary = 'parallel test runner'
   s.description = 'minitest/rspec parallel test runner for CI environments'
 
@@ -10,7 +11,7 @@ spec = Gem::Specification.new do |s|
   s.email = "ruby@tmm1.net"
   s.license = 'MIT'
 
-  s.bindir = 'bin'
+  s.bindir = 'exe'
   s.executables << 'rspec-queue'
   s.executables << 'minitest-queue'
   s.executables << 'testunit-queue'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-queue
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Aman Gupta
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2022-07-16 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies: []
 description: minitest/rspec parallel test runner for CI environments
 email: ruby@tmm1.net
@@ -20,34 +20,24 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
+- Appraisals
 - Gemfile
-- Gemfile-cucumber1-3
-- Gemfile-cucumber1-3.lock
-- Gemfile-cucumber2-4
-- Gemfile-cucumber2-4.lock
-- Gemfile-minitest4
-- Gemfile-minitest4.lock
-- Gemfile-minitest5
-- Gemfile-minitest5.lock
-- Gemfile-rspec2-1
-- Gemfile-rspec2-1.lock
-- Gemfile-rspec3-0
-- Gemfile-rspec3-0.lock
-- Gemfile-rspec3-1
-- Gemfile-rspec3-1.lock
-- Gemfile-rspec3-2
-- Gemfile-rspec3-2.lock
-- Gemfile-testunit
-- Gemfile-testunit.lock
-- Gemfile.lock
 - LICENSE
 - README.md
-- bin/cucumber-queue
-- bin/minitest-queue
-- bin/rspec-queue
-- bin/testunit-queue
+- Rakefile
+- exe/cucumber-queue
+- exe/minitest-queue
+- exe/rspec-queue
+- exe/testunit-queue
+- gemfiles/cucumber1_3.gemfile
+- gemfiles/cucumber2_4.gemfile
+- gemfiles/minitest4.gemfile
+- gemfiles/minitest5.gemfile
+- gemfiles/rspec2.gemfile
+- gemfiles/rspec3.gemfile
+- gemfiles/testunit.gemfile
 - lib/test-queue.rb
 - lib/test_queue.rb
 - lib/test_queue/iterator.rb
@@ -65,14 +55,13 @@ files:
 - lib/test_queue/stats.rb
 - lib/test_queue/test_framework.rb
 - script/bootstrap
-- script/cibuild
-- script/spec
 - spec/stats_spec.rb
 - test-queue.gemspec
 - test/cucumber.bats
 - test/minitest4.bats
 - test/minitest5.bats
-- test/rspec.bats
+- test/rspec2.bats
+- test/rspec3.bats
 - test/samples/features/bad.feature
 - test/samples/features/sample.feature
 - test/samples/features/sample2.feature
@@ -102,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: parallel test runner

data/.travis.yml

@@ -1,18 +0,0 @@
-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-cucumber1-3

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

data/Gemfile-cucumber1-3.lock

@@ -1,33 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test-queue (0.5.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

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

data/Gemfile-cucumber2-4.lock

@@ -1,37 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test-queue (0.5.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

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

data/Gemfile-minitest4.lock

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

data/Gemfile-minitest5

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

data/Gemfile-minitest5.lock

@@ -1,19 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test-queue (0.5.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

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

data/Gemfile-rspec2-1.lock

@@ -1,27 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test-queue (0.5.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

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

data/Gemfile-rspec3-0.lock

@@ -1,31 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test-queue (0.5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rspec (~> 3.0.0)
-  test-queue!
-
-BUNDLED WITH
-   1.13.1

data/Gemfile-rspec3-1

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

data/Gemfile-rspec3-1.lock

@@ -1,31 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test-queue (0.5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    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)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rspec (~> 3.1.0)
-  test-queue!
-
-BUNDLED WITH
-   1.13.1

data/Gemfile-rspec3-2

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

data/Gemfile-rspec3-2.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test-queue (0.5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rspec (~> 3.2.0)
-  test-queue!
-
-BUNDLED WITH
-   1.13.1

data/Gemfile-testunit

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-gem 'test-unit', '3.0.8'

data/Gemfile-testunit.lock

@@ -1,21 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test-queue (0.5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    power_assert (0.2.2)
-    test-unit (3.0.8)
-      power_assert
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  test-queue!
-  test-unit (= 3.0.8)
-
-BUNDLED WITH
-   1.13.1

data/Gemfile.lock

@@ -1,41 +0,0 @@
-PATH
-  remote: .
-  specs:
-    test-queue (0.5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    builder (3.2.2)
-    cucumber (1.3.10)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
-    diff-lcs (1.2.4)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    minitest (5.3.3)
-    multi_json (1.8.4)
-    multi_test (0.0.3)
-    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
-  cucumber (~> 1.3.10)
-  minitest (= 5.3.3)
-  rspec (>= 2.13, < 4.0)
-  test-queue!
-
-BUNDLED WITH
-   1.13.1

data/script/cibuild

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-if [ "$SUITE" = "ruby" ]; then
-  exec script/spec
-fi
-
-export TEST_QUEUE_WORKERS=2 TEST_QUEUE_VERBOSE=1
-
-if [ -f "Gemfile-$SUITE" ]; then
-  export BUNDLE_GEMFILE="Gemfile-$SUITE"
-else
-  export BUNDLE_GEMFILE=Gemfile
-fi
-
-bundle install
-
-vendor/bats/bin/bats test

data/script/spec

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-export BUNDLE_GEMFILE=Gemfile-rspec3-2
-bundle install
-bundle exec rspec spec