test-queue 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b99d05b99bd64f0b8efb578d5641077984fae57a6cef805f3ed92beb0fadb56b
-  data.tar.gz: dec70c7bef1dd759350333fa913ee780494dab07575342baa9e6545a9808c42a
+  metadata.gz: cf82719e0483ccba7f40a8a66ffdd0d262bd2ff79cae203055e730988eed1219
+  data.tar.gz: 584b68033ee5540cc1c2aaeeb1c391e04ff67b158e6c170975151397ea287c66
 SHA512:
-  metadata.gz: 8ac80e29b3b5f7ac78db7f4167a8d75de63e3e5295f00139182257b99991003abd801f38c9c216310ab21566fba1ac216585c3621204d59df1a58f917e2cbf30
-  data.tar.gz: caf10f2498bd05f890dad0cc4feb45c5b0d2824d4ef3a3a00c9e1255fdbdf777437eee4ea9a4543752125c90f5cea7361778bec0b1eb64527ce895bdea93ec5b
+  metadata.gz: 041b553cf8d565683e9bf304e043ca0e44346a14243969834d4dc5e3d98f8ada5c96ada0e42ad0da4d4ccc488322013b632b6f2cde4633908d7b526915c7af74
+  data.tar.gz: ac21ecddc2d3236e5b7de2bc0d138ac791d420efea33a43286294169fba4082329de1540c614153273cc0783e8897b9700bd24469fbad660168c22ec86c9ae65

data/lib/test_queue/iterator.rb

@@ -38,10 +38,8 @@ module TestQueue
         end
         break if client.nil?
 
-        # rubocop:disable Lint/IncompatibleIoSelectWithFiberScheduler
         # This false positive will be resolved by https://github.com/rubocop/rubocop/pull/11830.
         _r, _w, e = IO.select([client], nil, [client], nil)
-        # rubocop:enable Lint/IncompatibleIoSelectWithFiberScheduler
         break unless e.empty?
 
         if (data = client.read(65536))

data/lib/test_queue/runner/minitest.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-begin
-  require 'minitest'
-  require_relative '../runner/minitest5'
-rescue LoadError
-  require 'minitest/unit'
-  require_relative '../runner/minitest4'
-end
+require 'minitest'
+
+raise 'requires Minitest version 5' unless Minitest::VERSION.to_i == 5
+
+require_relative '../runner/minitest5'
 
 module TestQueue
   class Runner

data/lib/test_queue/runner/rspec.rb

@@ -1,33 +1,42 @@
 # frozen_string_literal: true
 
-require_relative '../runner'
 require 'rspec/core'
 
-case RSpec::Core::Version::STRING.to_i
-when 2
-  require_relative 'rspec2'
-when 3, 4
-  require_relative 'rspec3'
-else
-  raise 'requires rspec version 2, 3, or 4'
-end
+raise 'requires RSpec version 3 or 4' unless [3, 4].include?(RSpec::Core::Version::STRING.to_i)
+
+require_relative 'rspec_ext'
+require_relative '../runner'
 
 module TestQueue
   class Runner
     class RSpec < Runner
       def initialize
         super(TestFramework::RSpec.new)
+
+        @rspec = ::RSpec::Core::QueueRunner.new
+      end
+
+      def start_master
+        seed_notification = ::RSpec::Core::Notifications::SeedNotification.new(@rspec.configuration.seed, seed_used?)
+        puts "#{seed_notification.fully_formatted}\n"
+
+        super
       end
 
       def run_worker(iterator)
-        rspec = ::RSpec::Core::QueueRunner.new
-        rspec.run_each(iterator).to_i
+        @rspec.run_each(iterator).to_i
       end
 
       def summarize_worker(worker)
         worker.summary = worker.lines.grep(/ examples?, /).first
         worker.failure_output = worker.output[/^Failures:\n\n(.*)\n^Finished/m, 1]
       end
+
+      private
+
+      def seed_used?
+        @rspec.configuration.seed && @rspec.configuration.seed_used?
+      end
     end
   end
 

data/lib/test_queue/runner.rb

@@ -90,13 +90,7 @@ module TestQueue
       @run_token = ENV['TEST_QUEUE_RELAY_TOKEN'] || SecureRandom.hex(8)
       @socket = socket || ENV['TEST_QUEUE_SOCKET'] || "/tmp/test_queue_#{$$}_#{object_id}.sock"
       @relay = relay || ENV['TEST_QUEUE_RELAY']
-
-      @remote_master_message = if ENV.key?('TEST_QUEUE_REMOTE_MASTER_MESSAGE')
-                                 ENV['TEST_QUEUE_REMOTE_MASTER_MESSAGE']
-                               elsif ENV.key?('TEST_QUEUE_SLAVE_MESSAGE')
-                                 warn('`TEST_QUEUE_SLAVE_MESSAGE` is deprecated. Use `TEST_QUEUE_REMOTE_MASTER_MESSAGE` instead.')
-                                 ENV['TEST_QUEUE_SLAVE_MESSAGE']
-                               end
+      @remote_master_message = ENV['TEST_QUEUE_REMOTE_MASTER_MESSAGE'] if ENV.key?('TEST_QUEUE_REMOTE_MASTER_MESSAGE')
 
       if @relay == @socket
         warn '*** Detected TEST_QUEUE_RELAY == TEST_QUEUE_SOCKET. Disabling relay mode.'
@@ -323,7 +317,9 @@ module TestQueue
 
             @server.connect_address.connect do |sock|
               sock.puts("TOKEN=#{@run_token}")
-              sock.puts("NEW SUITE #{Marshal.dump([suite_name, path])}")
+              data = Marshal.dump([suite_name, path])
+              sock.puts("NEW SUITE #{data.bytesize}")
+              sock.write(data)
             end
           end
         end
@@ -513,8 +509,9 @@ module TestQueue
             worker = Marshal.load(data)
             worker_completed(worker)
             remote_workers -= 1
-          when /\ANEW SUITE (.+)/
-            suite_name, path = Marshal.load($1)
+          when /\ANEW SUITE (\d+)/
+            data = sock.read($1.to_i)
+            suite_name, path = Marshal.load(data)
             enqueue_discovered_suite(suite_name, path)
           when /\AKABOOM/
             # worker reporting an abnormal number of test failures;

data/lib/test_queue/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestQueue
-  VERSION = '0.8.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-queue
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Aman Gupta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-07 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies: []
 description: minitest/rspec parallel test runner for CI environments
 email: ruby@tmm1.net
@@ -33,12 +33,10 @@ files:
 - lib/test_queue/runner/cucumber.rb
 - lib/test_queue/runner/example.rb
 - lib/test_queue/runner/minitest.rb
-- lib/test_queue/runner/minitest4.rb
 - lib/test_queue/runner/minitest5.rb
 - lib/test_queue/runner/puppet_lint.rb
 - lib/test_queue/runner/rspec.rb
-- lib/test_queue/runner/rspec2.rb
-- lib/test_queue/runner/rspec3.rb
+- lib/test_queue/runner/rspec_ext.rb
 - lib/test_queue/runner/testunit.rb
 - lib/test_queue/stats.rb
 - lib/test_queue/test_framework.rb

data/lib/test_queue/runner/minitest4.rb

@@ -1,93 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../runner'
-require 'set'
-require 'stringio'
-
-class MiniTestQueueRunner < MiniTest::Unit
-  def _run_suites(suites, type)
-    self.class.output = $stdout
-
-    if defined?(ParallelEach)
-      # Ignore its _run_suites implementation since we don't handle it gracefully.
-      # If we don't do this #partition is called on the iterator and all suites
-      # distributed immediately, instead of picked up as workers are available.
-      suites.map { |suite| _run_suite suite, type }
-    else
-      super
-    end
-  end
-
-  def _run_anything(*)
-    ret = super
-    output.puts
-    ret
-  end
-
-  def _run_suite(suite, type)
-    output.print '    '
-    output.print suite
-    output.print ': '
-
-    start = Time.now
-    ret = super
-    diff = Time.now - start
-
-    output.puts('  <%.3f>' % diff)
-    ret
-  end
-
-  self.runner = new
-  self.output = StringIO.new
-end
-
-class MiniTest::Unit::TestCase
-  class << self
-    attr_accessor :test_suites
-
-    def original_test_suites
-      @@test_suites.keys.reject { |s| s.test_methods.empty? }
-    end
-  end
-
-  def failure_count
-    failures.length
-  end
-end
-
-module TestQueue
-  class Runner
-    class Minitest < Runner
-      def initialize
-        if ::MiniTest::Unit::TestCase.original_test_suites.any?
-          raise 'Do not `require` test files. Pass them via ARGV instead and they will be required as needed.'
-        end
-
-        super(TestFramework::Minitest.new)
-      end
-
-      def run_worker(iterator)
-        ::MiniTest::Unit::TestCase.test_suites = iterator
-        ::MiniTest::Unit.new.run
-      end
-    end
-    MiniTest = Minitest # For compatibility with test-queue 0.7.0 and earlier.
-  end
-
-  class TestFramework
-    class Minitest < TestFramework
-      def all_suite_files
-        ARGV
-      end
-
-      def suites_from_file(path)
-        ::MiniTest::Unit::TestCase.reset
-        require File.absolute_path(path)
-        ::MiniTest::Unit::TestCase.original_test_suites.map { |suite|
-          [suite.name, suite]
-        }
-      end
-    end
-    MiniTest = Minitest # For compatibility with test-queue 0.7.0 and earlier.
-  end
-end

data/lib/test_queue/runner/rspec2.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-class ::RSpec::Core::ExampleGroup
-  def self.failure_count
-    examples.map { |e| e.execution_result[:status] == 'failed' }.length
-  end
-end
-
-module RSpec::Core
-  class QueueRunner < CommandLine
-    def initialize
-      super(ARGV)
-      @configuration.output_stream = $stdout
-      @configuration.error_stream  = $stderr
-    end
-
-    def run_each(iterator)
-      @configuration.reporter.report(0, @configuration.randomize? ? @configuration.seed : nil) do |reporter|
-        @configuration.run_hook(:before, :suite)
-        iterator.map { |g|
-          if g.is_a? ::RSpec::Core::Example
-            print "    #{g.full_description}: "
-            example = g
-            g = example.example_group
-            ::RSpec.world.filtered_examples.clear
-            examples = [example]
-            examples.extend(::RSpec::Core::Extensions::Ordered::Examples)
-            ::RSpec.world.filtered_examples[g] = examples
-          else
-            print "    #{g.description}: "
-          end
-          start = Time.now
-          ret = g.run(reporter)
-          diff = Time.now - start
-          puts('  <%.3f>' % diff)
-
-          ret
-        }.all? ? 0 : @configuration.failure_exit_code
-      ensure
-        @configuration.run_hook(:after, :suite)
-      end
-    end
-  end
-end