test-queue 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f689a4cffa234a32b4e3919fe2f263258cd32682925c29d59e26fdd0a8218236
-  data.tar.gz: 5e2f51214fa2dfcc184386fc588767f7ce15ac9738de0a3c8a730aed33995669
+  metadata.gz: a84d8eb24f2cdebe31f18be510d2ba28c8633e963beb62e498ef32674df3f761
+  data.tar.gz: 9869e95d639d312876faa0264b238ee8702ec21f5e5bc0bfe0d149ea1d83df31
 SHA512:
-  metadata.gz: 1f76dbac0466294ffca4a780f7c411611cba1c55006a22343bdc11d789e400b135d4457c889d591498ede4ec92dd12ce615239f3569667b061117729e2e61fbc
-  data.tar.gz: a9666ce78f35e7d1a4cf3f877782ef86b7909396fb12f27c6df883f483ff07907db6b3a9ced68c2f36eae55b2d3f28c9ed3699df3b4ed9a1fc9151b9147306a8
+  metadata.gz: 7a33f1567709b2fda5670cac096733d0ab1e029fe4db18aec6e1a449b00dd919e979167febe5a249b875d28e536224f0680dfb9810f2b585ea6064fcdb500dcf
+  data.tar.gz: 2486c1c8a85b4fe9fbe87eb98b7aa76ea97e01951f7e66d6db64e91dae57f8692f8354d036a7d57c342a46ab2833c6aac9fb7263b138fdb802d6993765a2e9b4

data/.github/workflows/test.yml

@@ -26,6 +26,7 @@ jobs:
           - { name: minitest4, bats: test/minitest4.bats }
           - { name: minitest5, bats: test/minitest5.bats }
           - { name: rspec3, bats: test/rspec3.bats }
+          - { name: rspec4, bats: test/rspec4.bats }
           - { name: testunit, bats: test/testunit.bats }
 
     steps:

data/.gitignore

@@ -3,4 +3,5 @@
 Gemfile.lock
 gemfiles/.bundle/
 *.gemfile.lock
+pkg
 vendor

data/Appraisals

@@ -30,6 +30,14 @@ appraise "rspec3" do
   gem 'rspec', '~> 3.12'
 end
 
+appraise "rspec4" do
+  gem 'rspec', github: 'rspec/rspec-metagem', branch: '4-0-dev'
+  gem 'rspec-core', github: 'rspec/rspec-core', branch: '4-0-dev'
+  gem 'rspec-expectations', github: 'rspec/rspec-expectations', branch: '4-0-dev'
+  gem 'rspec-mocks', github: 'rspec/rspec-mocks', branch: '4-0-dev'
+  gem 'rspec-support', github: 'rspec/rspec-support', branch: '4-0-dev'
+end
+
 appraise "testunit" do
   gem 'test-unit'
 end

data/gemfiles/rspec4.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem 'rspec', github: 'rspec/rspec-metagem', branch: '4-0-dev'
+gem 'rspec-core', github: 'rspec/rspec-core', branch: '4-0-dev'
+gem 'rspec-expectations', github: 'rspec/rspec-expectations', branch: '4-0-dev'
+gem 'rspec-mocks', github: 'rspec/rspec-mocks', branch: '4-0-dev'
+gem 'rspec-support', github: 'rspec/rspec-support', branch: '4-0-dev'
+
+gemspec path: "../"

data/lib/test_queue/iterator.rb

@@ -8,7 +8,7 @@ module TestQueue
       @suite_stats = []
       @sock = sock
       @filter = filter
-      if @sock =~ /^(.+):(\d+)$/
+      if @sock =~ /\A(.+):(\d+)\z/
         @tcp_address = $1
         @tcp_port = $2.to_i
       end

data/lib/test_queue/runner/rspec.rb

@@ -4,10 +4,10 @@ require 'rspec/core'
 case ::RSpec::Core::Version::STRING.to_i
 when 2
   require_relative 'rspec2'
-when 3
+when 3, 4
   require_relative 'rspec3'
 else
-  fail 'requires rspec version 2 or 3'
+  fail 'requires rspec version 2, 3, or 4'
 end
 
 module TestQueue

data/lib/test_queue/runner.rb

@@ -31,7 +31,7 @@ module TestQueue
     attr_accessor :concurrency, :exit_when_done
     attr_reader :stats
 
-    TOKEN_REGEX = /^TOKEN=(\w+)/
+    TOKEN_REGEX = /\ATOKEN=(\w+)/
 
     def initialize(test_framework, concurrency=nil, socket=nil, relay=nil)
       @test_framework = test_framework
@@ -251,7 +251,7 @@ module TestQueue
 
     def start_master
       if !relay?
-        if @socket =~ /^(?:(.+):)?(\d+)$/
+        if @socket =~ /\A(?:(.+):)?(\d+)\z/
           address = $1 || '0.0.0.0'
           port = $2.to_i
           @socket = "#$1:#$2"
@@ -500,7 +500,7 @@ module TestQueue
           end
 
           case cmd
-          when /^POP (\S+) (\d+)/
+          when /\APOP (\S+) (\d+)/
             hostname = $1
             pid = Integer($2)
             if awaiting_suites?
@@ -510,7 +510,7 @@ module TestQueue
               sock.write(data)
               @assignments[obj] = [hostname, pid]
             end
-          when /^REMOTE MASTER (\d+) ([\w\.-]+)(?: (.+))?/
+          when /\AREMOTE MASTER (\d+) ([\w\.-]+)(?: (.+))?/
             num = $1.to_i
             remote_master = $2
             remote_master_message = $3
@@ -521,15 +521,15 @@ module TestQueue
             message = "*** #{num} workers connected from #{remote_master} after #{Time.now-@start_time}s"
             message << " " + remote_master_message if remote_master_message
             STDERR.puts message
-          when /^WORKER (\d+)/
+          when /\AWORKER (\d+)/
             data = sock.read($1.to_i)
             worker = Marshal.load(data)
             worker_completed(worker)
             remote_workers -= 1
-          when /^NEW SUITE (.+)/
+          when /\ANEW SUITE (.+)/
             suite_name, path = Marshal.load($1)
             enqueue_discovered_suite(suite_name, path)
-          when /^KABOOM/
+          when /\AKABOOM/
             # worker reporting an abnormal number of test failures;
             # stop everything immediately and report the results.
             break

data/test/rspec4.bats

@@ -0,0 +1,56 @@
+load "testlib"
+
+setup() {
+  require_gem "rspec" "4.0.0.pre"
+}
+
+@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/samples/sample_shared_examples_for_spec.rb

@@ -1,5 +1,3 @@
-
-shared_examples_for 'Sample Example' do
-  it { should eq 5 }
+RSpec::shared_examples_for 'Sample Example' do
+  it { is_expected.to eq 5 }
 end
-

data/test/samples/sample_spec.rb

@@ -1,13 +1,13 @@
 require 'rspec'
 
-describe 'RSpecEqual' do
+RSpec::describe 'RSpecEqual' do
   it 'checks equality' do
     expect(1).to eq 1
   end
 end
 
 30.times do |i|
-  describe "RSpecSleep(#{i})" do
+  RSpec::describe "RSpecSleep(#{i})" do
     it "sleeps" do
       start = Time.now
       sleep(0.25)
@@ -17,7 +17,7 @@ end
 end
 
 if ENV["FAIL"]
-  describe 'RSpecFailure' do
+  RSpec::describe 'RSpecFailure' do
     it 'fails' do
       expect(:foo).to eq :bar
     end

data/test/samples/sample_split_spec.rb

@@ -1,6 +1,6 @@
 require "rspec"
 
-describe 'SplittableGroup', :no_split => !!ENV["NOSPLIT"] do
+RSpec::describe 'SplittableGroup', :no_split => !!ENV["NOSPLIT"] do
   2.times do |i|
     it "runs test #{i}" do
       # Sleep longer in CI to make the distribution of examples across workers

data/test/samples/sample_use_shared_example1_spec.rb

@@ -1,8 +1,7 @@
 require 'rspec'
 require_relative 'sample_rspec_helper'
 
-describe 'Use SharedExamplesFor test_1' do
+RSpec::describe 'Use SharedExamplesFor test_1' do
   subject { 5 }
   it_behaves_like 'Sample Example'
 end
-

data/test/samples/sample_use_shared_example2_spec.rb

@@ -1,8 +1,7 @@
 require 'rspec'
 require_relative 'sample_rspec_helper'
 
-describe 'Use SharedExamplesFor test_2' do
+RSpec::describe 'Use SharedExamplesFor test_2' do
   subject { 5 }
   it_behaves_like 'Sample Example'
 end
-

data/test-queue.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'test-queue'
-  s.version = '0.6.0'
+  s.version = '0.7.0'
   s.required_ruby_version = '>= 2.7.0'
   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.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Aman Gupta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-04-26 00:00:00.000000000 Z
 dependencies: []
 description: minitest/rspec parallel test runner for CI environments
 email: ruby@tmm1.net
@@ -37,6 +37,7 @@ files:
 - gemfiles/minitest5.gemfile
 - gemfiles/rspec2.gemfile
 - gemfiles/rspec3.gemfile
+- gemfiles/rspec4.gemfile
 - gemfiles/testunit.gemfile
 - lib/test-queue.rb
 - lib/test_queue.rb
@@ -62,6 +63,7 @@ files:
 - test/minitest5.bats
 - test/rspec2.bats
 - test/rspec3.bats
+- test/rspec4.bats
 - test/samples/features/bad.feature
 - test/samples/features/sample.feature
 - test/samples/features/sample2.feature
@@ -98,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: parallel test runner