minitest-distributed 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 655c323406da3624b5c1a9aa6fb61fdb9b65816e4c440f08b03c7f6c90020082
-  data.tar.gz: 0f1decd1f9c88803ee9abf766111b8902c74327f0d2ad287189c5fe72ba46464
+  metadata.gz: bfef30635f4dd487b913e94e04a1098f27d27278af1f1adbb794a1f91f54e880
+  data.tar.gz: cff09c3e45440e77a7f39dabcdc6faf3a99336cc05362ea1740c810c91bb227b
 SHA512:
-  metadata.gz: 48ce33a0bc593730ee3ca28332ab831608cec1af4ab6c28bed0c6bf05dec625817cf595f59961afe683c184fd8ce7f0933c1e392ebb5c099329998494bc76bda
-  data.tar.gz: fdea9c05ec72f5022be1d1a2c8a0a98da4f147624992ddb5ce8f5511da2f3f1a521110b3c126073370da2a1e570100cbd873d106c3d32af7dd430ae4380f9001
+  metadata.gz: b9a05e26c4b0a432d3b7c2d8aec342d141b0fc5b4a1b7a355b6e5e14609a85e834c60fde5d6bf32a85529d9678c0ce19e2a8e9feb1d6da49c761b77289c340b0
+  data.tar.gz: 430c1c0da35af7e4db05580676de9ae4d911ecb0673d99535b07c00a72f600dd71e3e279a127e254bba2be13352579d1867ff376edaf1b91fd241b5b6da0b408

data/.rubocop.yml

@@ -11,25 +11,6 @@ AllCops:
   Exclude:
     - minitest-distributed.gemspec
 
-Style/MethodCallWithArgsParentheses:
-  IgnoredMethods:
-    - require
-    - require_relative
-    - raise
-    - assert
-    - refute
-    - assert_equal
-    - refute_equal
-    - assert_nil
-    - refute_nil
-    - assert_predicate
-    - refute_predicate
-    - assert_empty
-    - refute_empty
-    - assert_includes
-    - refute_includes
-    - flunk
-
 ##### Sorbet cops
 
 Sorbet:
@@ -44,6 +25,9 @@ Sorbet:
 Sorbet/ValidSigil:
   Enabled: true
 
+Sorbet/FalseSigil:
+  Enabled: false
+
 Sorbet/TrueSigil:
   Enabled: true
 

data/lib/minitest/distributed/configuration.rb

@@ -9,7 +9,7 @@ module Minitest
     class Configuration < T::Struct
       DEFAULT_BATCH_SIZE = 10
       DEFAULT_MAX_ATTEMPTS = 3
-      DEFAULT_TEST_TIMEOUT = 30_000 # milliseconds
+      DEFAULT_TEST_TIMEOUT = 30.0 # seconds
 
       class << self
         extend T::Sig
@@ -20,7 +20,7 @@ module Minitest
             coordinator_uri: URI(env['MINITEST_COORDINATOR'] || 'memory:'),
             run_id: env['MINITEST_RUN_ID'] || SecureRandom.uuid,
             worker_id: env['MINITEST_WORKER_ID'] || SecureRandom.uuid,
-            test_timeout: Integer(env['MINITEST_TEST_TIMEOUT'] || DEFAULT_TEST_TIMEOUT),
+            test_timeout: Float(env['MINITEST_TEST_TIMEOUT'] || DEFAULT_TEST_TIMEOUT),
             test_batch_size: Integer(env['MINITEST_TEST_BATCH_SIZE'] || DEFAULT_BATCH_SIZE),
             max_attempts: Integer(env['MINITEST_MAX_ATTEMPTS'] || DEFAULT_MAX_ATTEMPTS),
           )
@@ -32,7 +32,7 @@ module Minitest
       prop :coordinator_uri, URI::Generic, default: URI('memory:')
       prop :run_id, String, factory: -> { SecureRandom.uuid }
       prop :worker_id, String, factory: -> { SecureRandom.uuid }
-      prop :test_timeout, Integer, default: DEFAULT_TEST_TIMEOUT
+      prop :test_timeout, Float, default: DEFAULT_TEST_TIMEOUT
       prop :test_batch_size, Integer, default: DEFAULT_BATCH_SIZE
       prop :max_attempts, Integer, default: DEFAULT_MAX_ATTEMPTS
 

data/lib/minitest/distributed/coordinators/redis_coordinator.rb

@@ -250,7 +250,7 @@ module Minitest
           # Every test is allowed to take test_timeout milliseconds. Because we process tests in
           # batches, they should never be pending for TEST_TIMEOUT * BATCH_SIZE milliseconds.
           # So, only try to claim messages older than that, with a bit of jitter.
-          max_idle_time = configuration.test_timeout * configuration.test_batch_size
+          max_idle_time = Integer(configuration.test_timeout * configuration.test_batch_size * 1000)
           max_idle_time_with_jitter = max_idle_time * rand(1.0...1.2)
           to_claim = pending.each_with_object({}) do |message, hash|
             if message['elapsed'] > max_idle_time_with_jitter
@@ -291,7 +291,7 @@ module Minitest
         sig { params(er: EnqueuedRunnable).void }
         def mark_runnable_to_fail_immediately(er)
           assertion = Minitest::Assertion.new(<<~EOM.chomp)
-            This test takes too long to run (> #{configuration.test_timeout}ms).
+            This test takes too long to run (> #{configuration.test_timeout}s).
 
             We have tried running this test #{configuration.max_attempts} on different workers, but every time the worker has not reported back a result within #{configuration.test_timeout}ms.
             Try to make the test faster, or increase the test timeout.

data/lib/minitest/distributed/result_type.rb

@@ -4,6 +4,8 @@
 module Minitest
   module Distributed
     class ResultType < T::Enum
+      extend T::Sig
+
       enums do
         Passed = new
         Failed = new

data/lib/minitest/distributed/version.rb

@@ -3,6 +3,6 @@
 
 module Minitest
   module Distributed
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/minitest/distributed_plugin.rb

@@ -19,7 +19,7 @@ module Minitest
       end
 
       opts.on('--test-timeout=TIMEOUT', "The maximum run time for a single test in seconds") do |timeout|
-        options[:distributed].test_timeout = Integer(timeout)
+        options[:distributed].test_timeout = Float(timeout)
       end
 
       opts.on('--max-attempts=ATTEMPTS', "The maximum number of attempts to run a test") do |attempts|
@@ -43,15 +43,21 @@ module Minitest
       return if options[:disable_distributed]
 
       Minitest.singleton_class.prepend(Minitest::Distributed::TestRunnerPatch)
+
+      remove_reporter(::Rails::TestUnitReporter) if defined?(::Rails::TestUnitReporter)
+      remove_reporter(Minitest::ProgressReporter)
+      remove_reporter(Minitest::SummaryReporter)
+
       options[:distributed].coordinator.register_reporters(reporter: reporter, options: options)
 
-      if reporter.reporters.reject! { |reporter| reporter.is_a?(Minitest::ProgressReporter) }
-        reporter << Minitest::Distributed::Reporters::DistributedPogressReporter.new(options[:io], options)
-      end
+      reporter << Minitest::Distributed::Reporters::DistributedPogressReporter.new(options[:io], options)
+      reporter << Minitest::Distributed::Reporters::DistributedSummaryReporter.new(options[:io], options)
+    end
 
-      if reporter.reporters.reject! { |reporter| reporter.is_a?(Minitest::SummaryReporter) }
-        reporter << Minitest::Distributed::Reporters::DistributedSummaryReporter.new(options[:io], options)
-      end
+    private
+
+    def remove_reporter(reporter_class)
+      reporter.reporters.reject! { |reporter| reporter.is_a?(reporter_class) }
     end
   end
 end

data/minitest-distributed.gemspec

@@ -45,6 +45,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency('minitest', '~> 5.12')
-  spec.add_dependency('redis', '~> 4.1')
+  spec.add_dependency('redis', '~> 4.2')
   spec.add_dependency('sorbet-runtime')
 end

data/sorbet/rbi/rails.rbi

@@ -0,0 +1,4 @@
+module Rails
+  class TestUnitReporter < Minitest::StatisticsReporter
+  end
+end

data/sorbet/rbi/winsize.rbi

@@ -1,3 +1,5 @@
+# typed: strict
+
 class IO
   sig { returns([Integer, Integer]) }
   def winsize; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-distributed
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Willem van Bergen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,7 @@ files:
 - minitest-distributed.gemspec
 - sorbet/config
 - sorbet/rbi/minitest.rbi
+- sorbet/rbi/rails.rbi
 - sorbet/rbi/rbconfig.rbi
 - sorbet/rbi/redis.rbi
 - sorbet/rbi/winsize.rbi