megatest 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce0e1b9ec47a98020fabc266db9d93f73961574ed6ef0bf29b4885064114216
-  data.tar.gz: c4dd6ed24dea6de74effca99474a850af28b77142a0c388dff2f4faf2f4b5338
+  metadata.gz: ffc34efd44ab621f7b9008e9f0a611715e8d3d66f6a524a407604166b6bb0612
+  data.tar.gz: a4149b89fe5d6fef8d0170f962bceefd860a75ccafe73f4f06a335fc27f3ffd2
 SHA512:
-  metadata.gz: 827fa2e37b36c4e8d7fae1317be65d259bac20210276245c119cbf33d506e967514295d4d74cc9fefd499e60aefacfd4a752f17f83feb58a46387af3d516c302
-  data.tar.gz: 3bfe1897107565dd27ae0eef08857b123eea0f181009669ab3e6c676f7fcbed7266fa3708f7b88589aadd518cb43cfaff8402a9648db5828373759b8219e2f6f
+  metadata.gz: a1a160e73481e907da8678544c4a267dfec6cdee353ee46c79222224a6d69f474612bc95e819ecf6a092d2bca8e3e595c59162c366fb94fbb1056206d8af32ef
+  data.tar.gz: 3d9482774172c04968f9e85a5006a2ff8b38dc34e92b2b5d2a2a6dd04fa808c3daa1381d97cea2cfb263f19adb6a3d7dfe0b51c54cf7612d588cbead1582c456

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.4.0] - 2025-11-12
+
+- Allow configuring the test glob via `config.test_globs`.
+
 ## [0.3.0] - 2025-06-20
 
 - Added missing MIT license.

data/lib/megatest/cli.rb

@@ -92,7 +92,7 @@ module Megatest
         end
       end
 
-      @config.selectors = Selector.parse(@argv)
+      @config.selectors = Selector.new(@config).parse(@argv)
       Megatest.load_config(@config)
       Megatest.init(@config)
       test_cases = Megatest.load_tests(@config)
@@ -125,7 +125,7 @@ module Megatest
       queue = @config.build_queue
       raise InvalidArgument, "Distributed queues can't be bisected" if queue.distributed?
 
-      @config.selectors = Selector.parse(@argv)
+      @config.selectors = Selector.new(@config).parse(@argv)
       Megatest.load_config(@config)
       Megatest.init(@config)
       test_cases = Megatest.load_tests(@config)

data/lib/megatest/config.rb

@@ -139,7 +139,7 @@ module Megatest
     attr_accessor :queue_url, :retry_tolerance, :max_retries, :jobs_count, :job_index, :load_paths, :deprecations,
                   :build_id, :heartbeat_frequency, :minitest_compatibility, :ci, :selectors
     attr_reader :before_fork_callbacks, :global_setup_callbacks, :backtrace, :circuit_breaker, :seed,
-                :worker_id, :workers_count
+                :worker_id, :workers_count, :test_globs
     attr_writer :differ, :pretty_printer, :program_name, :colors
 
     def initialize(env)
@@ -168,12 +168,18 @@ module Megatest
       @pretty_printer = PrettyPrint.new(self)
       @minitest_compatibility = false
       @selectors = nil
+      @test_globs = [DEFAULT_TEST_GLOB]
       CIService.configure(self, env)
     end
 
+    def test_globs=(patterns)
+      @test_globs = normalize_test_glob(patterns)
+    end
+
     def initialize_dup(_)
       super
       @circuit_breaker = @circuit_breaker.dup
+      @test_globs = @test_globs.dup
     end
 
     def program_name
@@ -305,6 +311,16 @@ module Megatest
         instance_variable_set(name, value)
       end
     end
+
+    private
+
+    def normalize_test_glob(patterns)
+      if patterns
+        Array(patterns).compact.map(&:to_s)
+      else
+        [DEFAULT_TEST_GLOB]
+      end
+    end
   end
 
   @config = Config.new({})

data/lib/megatest/redis_queue.rb

@@ -232,11 +232,14 @@ module Megatest
     def populate(test_cases)
       super
 
-      leader_key_set, = @redis.pipelined do |pipeline|
-        pipeline.call("setnx", key("leader-status"), "setup")
+      value = key("leader-setup", worker_id)
+      # NB: If we assumed redis 7+ this could be a single command: `SET <key> NX GET EX @ttl <value>`.
+      _, _, leader = @redis.multi do |pipeline|
+        pipeline.call("setnx", key("leader-status"), value)
         pipeline.call("expire", key("leader-status"), @ttl)
+        pipeline.call("get", key("leader-status"))
       end
-      @leader = leader_key_set == 1
+      @leader = leader == value
 
       if @leader
         @redis.multi do |transaction|

data/lib/megatest/reporters.rb

@@ -113,8 +113,8 @@ module Megatest
           p99 = sorted_results[(size * 0.99).to_i].duration
 
           @out.puts "Finished in #{s(executor.wall_time.to_f)}, average: #{ms(average)}, median: #{ms(median)}, p90: #{ms(p90)}, p99: #{ms(p99)}"
-          cuttoff = p90 * 10
-          slowest_tests = sorted_results.last(5).select { |r| r.duration > cuttoff }
+          cutoff = p90 * 10
+          slowest_tests = sorted_results.last(5).select { |r| r.duration > cutoff }
           unless slowest_tests.empty?
             @out.puts "Slowest tests:"
             slowest_tests.reverse_each do |result|

data/lib/megatest/selector.rb

@@ -3,12 +3,12 @@
 # :stopdoc:
 
 module Megatest
-  module Selector
+  class Selector
     class List
-      def initialize(loaders, filters)
+      def initialize(config, loaders, filters)
         @loaders = loaders
         if loaders.empty?
-          @loaders = [Loader.new("test")]
+          @loaders = [Loader.new(config, "test")]
         end
         @filters = filters
       end
@@ -56,11 +56,11 @@ module Megatest
     class Loader
       attr_reader :path
 
-      def initialize(path, filter = nil)
+      def initialize(config, path, filter = nil)
         @path = File.expand_path(path)
         if @directory = File.directory?(@path)
           @path = File.join(@path, "/")
-          @paths = Megatest.glob(@path)
+          @paths = Megatest.glob(config.test_globs.map { |pattern| File.join(@path, pattern) })
         else
           @paths = [@path]
         end
@@ -244,54 +244,56 @@ module Megatest
       NameFilter,
     ].freeze
 
-    class << self
-      def parse(argv)
-        if argv.empty?
-          return List.new([], [])
-        end
+    def initialize(config)
+      @config = config
+    end
 
-        argv = argv.dup
-        loaders = []
-        filters = []
+    def parse(argv)
+      if argv.empty?
+        return List.new(@config, [], [])
+      end
 
-        negative = false
+      argv = argv.dup
+      loaders = []
+      filters = []
 
-        until argv.empty?
-          case argument = argv.shift
-          when "!"
-            negative = true
-          else
-            loader_str, filter_str = argument.split(":", 2)
-            loader_str = nil if loader_str.empty?
-
-            filter = nil
-            if filter_str
-              FILTERS.each do |filter_class|
-                if filter = filter_class.parse(filter_str)
-                  break
-                end
+      negative = false
+
+      until argv.empty?
+        case argument = argv.shift
+        when "!"
+          negative = true
+        else
+          loader_str, filter_str = argument.split(":", 2)
+          loader_str = nil if loader_str.empty?
+
+          filter = nil
+          if filter_str
+            FILTERS.each do |filter_class|
+              if filter = filter_class.parse(filter_str)
+                break
               end
             end
+          end
 
-            if loader_str
-              loader = Loader.new(loader_str, filter)
-              if negative
-                loader = NegativeLoader.new(loader)
-                negative = false
-              end
-              loaders << loader
-            else
-              if negative
-                filter = NegativeFilter.new(filter)
-                negative = false
-              end
-              filters << filter
+          if loader_str
+            loader = Loader.new(@config, loader_str, filter)
+            if negative
+              loader = NegativeLoader.new(loader)
+              negative = false
+            end
+            loaders << loader
+          else
+            if negative
+              filter = NegativeFilter.new(filter)
+              negative = false
             end
+            filters << filter
           end
         end
-
-        List.new(loaders, filters)
       end
+
+      List.new(@config, loaders, filters)
     end
   end
 end

data/lib/megatest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Megatest
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/megatest.rb

@@ -12,6 +12,7 @@ module Megatest
   ROOT = -File.expand_path("../", __FILE__)
   PWD = File.join(Dir.pwd, "/")
   IGNORED_ERRORS = [NoMemoryError, SignalException, SystemExit].freeze
+  DEFAULT_TEST_GLOB = "**/{test_*,*_test}.rb"
 
   class << self
     def fork?
@@ -90,12 +91,12 @@ module Megatest
     end
 
     if Dir.method(:glob).parameters.include?(%i(key sort)) # Ruby 2.7+
-      def glob(path)
-        Dir.glob(File.join(path, "**/{test_*,*_test}.rb"))
+      def glob(pattern)
+        Dir.glob(pattern)
       end
     else
-      def glob(path)
-        paths = Dir.glob(File.join(path, "**/{test_*,*_test}.rb"))
+      def glob(pattern)
+        paths = Dir.glob(pattern)
         paths.sort!
         paths
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: megatest
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jean Boussier
 bindir: exe
 cert_chain: []
-date: 2025-06-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Largely API compatible with test-unit / minitest, but with lots of extra
   modern niceties like a proper CLI, test distribution, etc.
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Modern test-unit style test framework
 test_files: []