minitest-distributed 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076d9467680eff44b28d42436648c5f4878fb5689bca7ddd9365bd05991a5352
-  data.tar.gz: '0068262916e339e61d4997eb478df915be5943d3a6b39e70fb02def9ba0d0dbb'
+  metadata.gz: 829613fe27e895208e49a116fd8f72e3685e1e91eb95209db170ad51707d2115
+  data.tar.gz: 1e0932553fe7d007e40392f53f80dd49eb6dafd533077d8234d4feb86629e8d4
 SHA512:
-  metadata.gz: 5d71ead8d7f352d9d628ec6682d2367804c63362e1e02e658ae3899b55486e1ff1bedd1cc10e23796a3373a0a3d0580b874646c4f7e3ec472675b8b85d88b001
-  data.tar.gz: cafd308bdad9ee0332323e0e826810fee2be91cbb5bdafa74ec8037891e9a6031ffa6f4f1e4777527e0f21784a48502848893661120145749629240164c3c077
+  metadata.gz: 71dbe335df12886c11af8f438dec954678ad9d5841847e44521e492dfc641eddc76da66e73c0f5d96840f75746e027f3304d08ed46171817a0541d773495b32f
+  data.tar.gz: fb5a8f6f781c71944df6228e4da980b29f2bd01fd9733aebe10437ac8eaa867d7d55b49397ad2d4f1acca9d503e8b2a8191fcfc8f935675a78f9d75208e0a39f

data/lib/minitest/distributed/configuration.rb

@@ -27,9 +27,10 @@ module Minitest
           )
         end
 
-        sig { params(opts: OptionParser).returns(T.attached_class) }
-        def from_command_line_options(opts)
+        sig { params(opts: OptionParser, options: T::Hash[Symbol, T.untyped]).returns(T.attached_class) }
+        def from_command_line_options(opts, options)
           configuration = from_env
+          configuration.progress = options[:io].tty?
 
           opts.on('--coordinator=URI', "The URI pointing to the coordinator") do |uri|
             configuration.coordinator_uri = URI.parse(uri)
@@ -66,6 +67,10 @@ module Minitest
             configuration.retry_failures = enabled
           end
 
+          opts.on('--[no-]progress', "Show progress during the test run") do |enabled|
+            configuration.progress = enabled
+          end
+
           configuration
         end
       end
@@ -80,6 +85,7 @@ module Minitest
       prop :max_attempts, Integer, default: DEFAULT_MAX_ATTEMPTS
       prop :max_failures, T.nilable(Integer)
       prop :retry_failures, T::Boolean, default: true
+      prop :progress, T::Boolean, default: false
 
       sig { returns(Coordinators::CoordinatorInterface) }
       def coordinator

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

@@ -66,8 +66,9 @@ module Minitest
 
             reporter.prerecord(enqueued_runnable.runnable_class, enqueued_runnable.method_name)
 
-            enqueued_result = enqueued_runnable.run do |initial_result|
-              if ResultType.of(initial_result) == ResultType::Requeued
+            initial_result = enqueued_runnable.run
+            enqueued_result = enqueued_runnable.commit_result(initial_result) do |result_to_commit|
+              if ResultType.of(result_to_commit) == ResultType::Requeued
                 queue << enqueued_runnable.next_attempt
               end
               EnqueuedRunnable::Result::Commit.success

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

@@ -440,15 +440,18 @@ module Minitest
 
           local_results.size += batch.size
 
-          runnable_results = T.let([], T::Array[EnqueuedRunnable::Result])
-          redis.multi do
-            batch.each do |enqueued_runnable|
-              # Fulfill the reporter contract by calling `prerecord` before we run the test.
-              reporter.prerecord(enqueued_runnable.runnable_class, enqueued_runnable.method_name)
+          # Call `prerecord` on the recorder for all tests in the batch, and run them.
+          results = batch.map do |enqueued_runnable|
+            reporter.prerecord(enqueued_runnable.runnable_class, enqueued_runnable.method_name)
+            [enqueued_runnable, enqueued_runnable.run]
+          end
 
-              # Actually run the test!
-              runnable_results << enqueued_runnable.run do |initial_result|
-                if ResultType.of(initial_result) == ResultType::Requeued
+          # Try to commit all the results of this batch to Redis
+          runnable_results = []
+          redis.multi do
+            results.each do |enqueued_runnable, initial_result|
+              runnable_results << enqueued_runnable.commit_result(initial_result) do |result_to_commit|
+                if ResultType.of(result_to_commit) == ResultType::Requeued
                   sadd_future = redis.sadd(key('retry_set'), enqueued_runnable.attempt_id)
                   EnqueuedRunnable::Result::Commit.new { sadd_future.value }
                 else

data/lib/minitest/distributed/enqueued_runnable.rb

@@ -202,26 +202,31 @@ module Minitest
 
       sig do
         params(
+          initial_result: Minitest::Result,
           block: T.proc.params(arg0: Minitest::Result).returns(EnqueuedRunnable::Result::Commit)
         ).returns(EnqueuedRunnable::Result)
       end
-      def run(&block)
-        initial_result = if attempts_exhausted?
+      def commit_result(initial_result, &block)
+        EnqueuedRunnable::Result.new(
+          enqueued_runnable: self,
+          initial_result: initial_result,
+          commit: block.call(initial_result),
+        )
+      end
+
+      sig { returns(Minitest::Result) }
+      def run
+        if attempts_exhausted?
           attempts_exhausted_result
         else
           result = Minitest.run_one_method(runnable_class, method_name)
           result_type = ResultType.of(result)
           if (result_type == ResultType::Error || result_type == ResultType::Failed) && !final_attempt?
-            result = Minitest::Requeue.wrap(result, attempt: attempt, max_attempts: max_attempts)
+            Minitest::Requeue.wrap(result, attempt: attempt, max_attempts: max_attempts)
+          else
+            result
           end
-          result
         end
-
-        EnqueuedRunnable::Result.new(
-          enqueued_runnable: self,
-          initial_result: initial_result,
-          commit: block.call(initial_result),
-        )
       end
 
       sig { returns(T.self_type) }

data/lib/minitest/distributed/reporters/distributed_progress_reporter.rb

@@ -20,6 +20,7 @@ module Minitest
           end
           @coordinator = T.let(options[:distributed].coordinator, Coordinators::CoordinatorInterface)
           @window_line_width = T.let(nil, T.nilable(Integer))
+          @show_progress = T.let(options[:distributed].progress, T::Boolean)
         end
 
         sig { override.void }
@@ -37,7 +38,7 @@ module Minitest
 
         sig { override.params(klass: T.class_of(Runnable), name: String).void }
         def prerecord(klass, name)
-          if io.tty?
+          if show_progress?
             clear_current_line
             io.print("[#{results.acks}/#{results.size}] #{klass}##{name}".slice(0...window_line_width))
           end
@@ -45,7 +46,7 @@ module Minitest
 
         sig { override.params(result: Minitest::Result).void }
         def record(result)
-          clear_current_line if io.tty?
+          clear_current_line if show_progress?
 
           case (result_type = ResultType.of(result))
           when ResultType::Passed
@@ -61,11 +62,16 @@ module Minitest
 
         sig { override.void }
         def report
-          clear_current_line if io.tty?
+          clear_current_line if show_progress?
         end
 
         private
 
+        sig { returns(T::Boolean) }
+        def show_progress?
+          @show_progress
+        end
+
         sig { void }
         def clear_current_line
           io.print("\r" + (' ' * window_line_width) + "\r")
@@ -76,6 +82,8 @@ module Minitest
           @window_line_width ||= begin
             _height, width = io.winsize
             width > 0 ? width : 80
+          rescue Errno::ENOTTY
+            80
           end
         end
 

data/lib/minitest/distributed/version.rb

@@ -3,6 +3,6 @@
 
 module Minitest
   module Distributed
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/minitest/distributed_plugin.rb

@@ -12,7 +12,7 @@ module Minitest
         options[:disable_distributed] = true
       end
 
-      options[:distributed] = Minitest::Distributed::Configuration.from_command_line_options(opts)
+      options[:distributed] = Minitest::Distributed::Configuration.from_command_line_options(opts, options)
     end
 
     def plugin_distributed_init(options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-distributed
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Willem van Bergen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest