wip

Author: ChrisBr

ruby/Gemfile.lock

@@ -31,7 +31,7 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
-    logger (1.6.1)
+    logger (1.7.0)
     minitest (5.22.3)
     minitest-reporters (1.6.1)
       ansi

ruby/Rakefile

@@ -8,7 +8,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   selected_files = ENV["TEST_FILES"].to_s.strip.split(/\s+/)
   selected_files = nil if selected_files.empty?
-  t.test_files = selected_files || FileList['test/**/*_test.rb'] - FileList['test/fixtures/**/*_test.rb']
+  t.test_files = selected_files || FileList['test/integration/minitest_redis_test.rb'] - FileList['test/fixtures/**/*_test.rb']
 end
 
 task :default => :test

ruby/lib/ci/queue/redis/base.rb

@@ -105,7 +105,13 @@ def custom_middlewares
         end
 
         def exhausted?
-          queue_initialized? && size == 0
+          # In batch upload mode, don't consider the queue exhausted while streaming
+          # The master is still uploading tests, so workers should wait/retry
+          if config.batch_upload && master_status == 'streaming'
+            false
+          else
+            queue_initialized? && size == 0
+          end
         end
 
         def expired?

ruby/lib/ci/queue/redis/worker.rb

@@ -65,6 +65,9 @@ def master?
 
         def poll
           wait_for_master
+          # Non-master workers need to fetch total from Redis after master finishes
+          @total ||= redis.get(key('total')).to_i unless master?
+          puts "Starting poll loop, master: #{master?}"
           attempt = 0
           until shutdown_required? || config.circuit_breakers.any?(&:open?) || exhausted? || max_test_failed?
             if test_id = reserve
@@ -199,43 +202,59 @@ def push_files_in_batches(file_paths, random)
             attempts = 0
             duration = measure do
               file_paths.each_slice(files_per_batch).with_index do |file_batch, batch_num|
-                # Load files in this batch
-                batch_tests = []
+                puts "Processing batch #{batch_num} with #{file_batch.size} files..."
+                # Track which file loaded which runnables
+                runnable_to_file = {}
+
+                # Load all files in this batch
                 file_batch.each do |file_path|
                   abs_path = ::File.expand_path(file_path)
+                  puts "Loading file #{abs_path}..."
                   require abs_path
+                  puts "Finished loading file #{abs_path}..."
                   @source_files_loaded.add(abs_path)
                 end
 
-                # Extract tests from newly loaded files
+                # Extract tests from runnables (call runnables only once!)
+                # The @index.key? check automatically skips already-processed tests
+                batch_tests = []
                 if defined?(Minitest)
+                  puts "Extracting tests from runnables..."
                   Minitest::Test.runnables.each do |runnable|
                     runnable.runnable_methods.each do |method_name|
                       test = Minitest::Queue::SingleExample.new(runnable, method_name)
                       unless @index.key?(test.id)
                         batch_tests << test
                         @index[test.id] = test
+                        # Map this runnable to the batch file for metadata
+                        runnable_to_file[runnable] ||= file_batch.first
                       end
                     end
                   end
                 end
 
+                puts "Found #{batch_tests.size} new tests in batch"
+
                 # Shuffle tests in this batch
                 batch_tests = Queue.shuffle(batch_tests, random)
-
+                puts "Shuffled tests: #{batch_tests.size}"
                 unless batch_tests.empty?
                   # Extract metadata
                   test_ids = []
                   metadata = {}
 
                   batch_tests.each do |test|
                     test_ids << test.id
-                    if test.respond_to?(:source_location) && (location = test.source_location)
-                      metadata[test.id] = location[0] # file path
+                    # Use the file that loaded the runnable, not source_location
+                    if runnable_to_file.key?(test.runnable)
+                      metadata[test.id] = runnable_to_file[test.runnable]
+                    elsif test.respond_to?(:source_location) && (location = test.source_location)
+                      metadata[test.id] = location[0] # fallback to source_location
                     end
                   end
 
                   # Upload batch to Redis
+                  puts "Uploading batch to Redis..."
                   with_redis_timeout(5) do
                     redis.without_reconnect do
                       redis.pipelined do |pipeline|
@@ -256,6 +275,8 @@ def push_files_in_batches(file_paths, random)
                     raise
                   end
 
+                  puts "Finished uploading batch to Redis..."
+
                   tests_uploaded += test_ids.size
 
                   # Progress reporting
@@ -280,6 +301,16 @@ def push_files_in_batches(file_paths, random)
 
             puts
             puts "Finished pushing #{@total} tests to the queue in #{duration.round(2)}s."
+          else
+            # Non-master workers need to load at least one test file to ensure
+            # the test_helper (and thus minitest/autorun) is loaded, which registers
+            # the at_exit hook needed for test execution
+            unless file_paths.empty?
+              first_file = file_paths.first
+              abs_path = ::File.expand_path(first_file)
+              require abs_path
+              @source_files_loaded.add(abs_path)
+            end
           end
 
           register
@@ -301,6 +332,7 @@ def build_index_entry(test_id)
           file_path = redis.hget(key('test-metadata'), test_id)
 
           if file_path && !@source_files_loaded.include?(file_path)
+            puts "Loading test file #{file_path}..."
             # Lazy load the test file
             require_test_file(file_path)
             @source_files_loaded.add(file_path)
@@ -339,7 +371,7 @@ def find_test_object(test_id)
           end
 
           # Fallback: create a test object that will report an error
-          warn "Warning: Test #{test_id} not found after loading file. Ensure all dependencies are explicitly required in test_helper.rb"
+          puts "Warning: Test #{test_id} not found after loading file. Ensure all dependencies are explicitly required in test_helper.rb"
           # Return nil and let index.fetch handle the KeyError
           nil
         end

ruby/lib/minitest/queue.rb

@@ -289,6 +289,7 @@ def loaded_tests
 
     def __run(*args)
       if queue
+        puts "------- Running tests #{queue.config.worker_id}"
         Queue.run(*args)
 
         if queue.config.circuit_breakers.any?(&:open?)

ruby/test/fixtures/test/dummy_test.rb

@@ -2,38 +2,10 @@
 require 'test_helper'
 
 class ATest < Minitest::Test
-  def test_foo
-    skip
-  end
-
-  def test_bar
-    assert false
-  end
 
-  def test_flaky
-    if defined?(@@already_ran) && @@already_ran
+  1000.times do |i|
+    define_method("test_dummy_#{i}") do
       assert true
-    else
-      @@already_ran = true
-      assert false
     end
   end
-
-  def test_flaky_fails_retry
-    assert false
-  end
-
-  def test_flaky_passes
-    assert true
-  end
-end
-
-class BTest < Minitest::Test
-  def test_foo
-    assert true
-  end
-
-  def test_bar
-    1 + '1'
-  end
 end