test-queue 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0270d50dbfc6b383940e726188a854e9cbba7b9fa5f1979f85e04ade484f04f9
-  data.tar.gz: 36990b90f5f47ccddabea471dd858aee75f29892640d4513e8023315a3dd71b8
+  metadata.gz: aa0c2ad5105a1578394da94c17d2a8c72d330023d66bd5f0df79300b848cd123
+  data.tar.gz: 1a623275a814f8c505241de2b85af5447567b5a089760192e2126479b43004b7
 SHA512:
-  metadata.gz: b7aba755710f56ae58b21e4bfbbc07b0b3832a54933ec74555fd28ae9f101a957c8c3d6950def76b63c56f54217d7fecc0638909a98ac71d83c88236b43e6951
-  data.tar.gz: c9435e822ed3abbec345791994be8aa8aa926bc8028bf1c14749f70a7e0a4821b92899dc89209e808f52c413e5073f07489aeb1096a58ecb77ed191a33c0f2d9
+  metadata.gz: 0cc7375bc4a6b845d9ea035351adefc425945560e4fc4cf3338eabce02bf72a6a4a92625bc1ac872d537e4202112cfb570d6d59c4b566ab4fc6203a3532d21aa
+  data.tar.gz: 60d073987945502fc020b45d3e936045940e2167d58750f10795d8cce3d008c9585ed2b053dde8c6950e54d664d13ac0a6e5659c271abec78c8062a94e10d280

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/rspec.rb

@@ -12,17 +12,31 @@ module TestQueue
     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/testunit.rb

@@ -4,57 +4,65 @@ require_relative '../runner'
 
 gem 'test-unit'
 require 'test/unit'
-require 'test/unit/collector/descendant'
-require 'test/unit/testresult'
-require 'test/unit/testsuite'
+require 'test/unit/collector/load'
 require 'test/unit/ui/console/testrunner'
 
-class Test::Unit::TestSuite
-  attr_accessor :iterator
-
-  def run(result, &progress_block)
-    @start_time = Time.now
-    yield(STARTED, name)
-    yield(STARTED_OBJECT, self)
-    run_startup(result)
-    (@iterator || @tests).each do |test|
-      @n_tests += test.size
-      run_test(test, result, &progress_block)
-      @passed = false unless test.passed?
-    end
-    run_shutdown(result)
-  ensure
-    @elapsed_time = Time.now - @start_time
-    yield(FINISHED, name)
-    yield(FINISHED_OBJECT, self)
-  end
-
-  def failure_count
-    (@iterator || @tests).sum { |t| t.instance_variable_get(:@_result).failure_count }
-  end
-end
-
 module TestQueue
   class Runner
     class TestUnit < Runner
-      def initialize
-        if Test::Unit::Collector::Descendant.new.collect.tests.any?
-          raise 'Do not `require` test files. Pass them via ARGV instead and they will be required as needed.'
+      class TestSuite < ::Test::Unit::TestSuite
+        def initialize(name, iterator)
+          super(name)
+          @tests = IteratorWrapper.new(iterator)
+        end
+
+        def run(*)
+          @started = true
+          super
+        end
+
+        def size
+          return 0 unless @started
+
+          super
+        end
+      end
+
+      class IteratorWrapper
+        def initialize(iterator)
+          @generator = Fiber.new do
+            iterator.each do |test|
+              Fiber.yield(test)
+            end
+          end
+        end
+
+        def shift
+          @generator.resume
+        rescue FiberError
+          nil
         end
 
+        def each
+          while (test = shift)
+            yield(test)
+          end
+        end
+      end
+
+      def initialize
         super(TestFramework::TestUnit.new)
       end
 
       def run_worker(iterator)
-        @suite = Test::Unit::TestSuite.new('specified by test-queue master')
-        @suite.iterator = iterator
+        @suite = TestSuite.new('specified by test-queue master', iterator)
         res = Test::Unit::UI::Console::TestRunner.new(@suite).start
         res.run_count - res.pass_count
       end
 
       def summarize_worker(worker)
         worker.summary = worker.output.split("\n").grep(/^\d+ tests?/).first
-        worker.failure_output = worker.output.scan(/^Failure:\n(.*)\n=======================*/m).join("\n")
+        worker.failure_output = worker.output.scan(/^Failure:[^\n]*\n(.*?)\n=======================*/m).join("\n")
       end
     end
   end
@@ -66,11 +74,39 @@ module TestQueue
       end
 
       def suites_from_file(path)
-        Test::Unit::TestCase::DESCENDANTS.clear
-        require File.absolute_path(path)
-        Test::Unit::Collector::Descendant.new.collect.tests.map { |suite|
-          [suite.name, suite]
-        }
+        test_suite = Test::Unit::Collector::Load.new.collect(path)
+        return [] unless test_suite
+        return test_suite.tests.map { [_1.name, _1] } unless split_groups?
+
+        split_groups(test_suite)
+      end
+
+      def split_groups?
+        return @split_groups if defined?(@split_groups)
+
+        @split_groups = ENV['TEST_QUEUE_SPLIT_GROUPS'] && ENV['TEST_QUEUE_SPLIT_GROUPS'].strip.downcase == 'true'
+      end
+
+      def split_groups(test_suite, groups = [])
+        unless splittable?(test_suite)
+          groups << [test_suite.name, test_suite]
+          return groups
+        end
+
+        test_suite.tests.each do |suite|
+          if suite.is_a?(Test::Unit::TestSuite)
+            split_groups(suite, groups)
+          else
+            groups << [suite.name, suite]
+          end
+        end
+        groups
+      end
+
+      def splittable?(test_suite)
+        test_suite.tests.none? do |test|
+          test.is_a?(Test::Unit::TestCase) && test[:no_split]
+        end
       end
     end
   end

data/lib/test_queue/runner.rb

@@ -317,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
@@ -507,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.9.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-queue
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Aman Gupta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-13 00:00:00.000000000 Z
+date: 2023-07-01 00:00:00.000000000 Z
 dependencies: []
 description: minitest/rspec parallel test runner for CI environments
 email: ruby@tmm1.net