minitest-fork_executor 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e166bd6d5d09dc03b3888c59beb8a30ba259c7cef826f0bcfa373375b232151c
-  data.tar.gz: caadad6c3971b6acafbe50fc0e1a3f76f7062d8c03bfe27ba11a578ecd91920e
+  metadata.gz: 6bd1e593335a149a422ff23630519000bd5f84e04bb8855682bd98511b07c6d1
+  data.tar.gz: 35f0d39d2498bd157e547ba852680a82fe3b5566616a7cdd28fa81b947cb160b
 SHA512:
-  metadata.gz: 5775181f930796a6b81c36cf265a0fe562f216e21fa6ae16c42b0dc1318c5ceacd078d580071d8d8a6f8c511d8f78b5fe7af52258930bea6787bb015a172bffc
-  data.tar.gz: 9a683822a4dd87af11d56088854e2cc10caf537388644f5f0ddabe8612b5ea92196b0b6f277a64758914fd0bc6712e33c3f90511d42d29bf707b40bc55c8dc69
+  metadata.gz: fc6a7ebe2f72cd6214469d3755325839289b0c65e05fa32544981bd2badbf865822ca62c07eeb731e39ce3f9267971b1426d092d37a68e6ec993083e4757b7b6
+  data.tar.gz: de20c9433516f9bfd89275e9d08802aa0ae50c2ffe5de60676dc148898012f000532328a67126a77600243452f297ea74c656bdbf5a9cba7ccb22568ceca1fcb

data/lib/minitest/fork_executor.rb

@@ -7,82 +7,106 @@ module Minitest
   # offered by more modern Rubies.
 
   class ForkExecutor
-    # #start is called by Minitest when initializing the executor. This is where
-    # we override some Minitest internals to implement fork-based execution.
-    def start
-      # Store the reference to the original run_one_method method in order to
-      # use it to actually run the test case.
-      original_run_one_method = Minitest.method(:run_one_method)
-
-      # Remove the original singleton method from Minitest in order to avoid
-      # method redefinition warnings when patching it in the next step.
-      class << Minitest
-        remove_method(:run_one_method)
+    # Run a fork-based test case. The block passed to the method should actually
+    # run the test using the original code from Minitest.
+    def self.run
+      # Set up a binary pipe for transporting test results from the child
+      # to the parent process.
+      read_io, write_io = IO.pipe
+      read_io.binmode
+      write_io.binmode
+
+      if Process.fork
+        # The parent process responsible for collecting results.
+
+        # The parent process doesn't write anything.
+        write_io.close
+
+        # Load the result object passed by the child process.
+        result = Marshal.load(read_io)
+
+        # Unwrap all failures from FailureTransport so that they can be
+        # safely presented to the user.
+        result.failures.map!(&:failure)
+
+        # We're done reading results from the child so it's safe to close the
+        # IO object now.
+        read_io.close
+
+        # Wait for the child process to finish before returning the result.
+        Process.wait
+      else
+        # The child process responsible for running the test case.
+
+        # Run the test case method via the original .run_one_method.
+        result = yield
+
+        # Wrap failures in FailureTransport to avoid issue when marshalling.
+        # Some failures correspond to exceptions referencing unmarshallable
+        # objects. For example, a PostgreSQL exception may reference
+        # PG::Connection that cannot be marshalled. In those case, we replace
+        # the original error with UnmarshallableError retaining as much
+        # detail as possible.
+        result.failures.map! { |failure| FailureTransport.new(failure) }
+
+        # The child process doesn't read anything.
+        read_io.close
+
+        # Dump the result object to the write IO object so that it can be
+        # read by the parent process.
+        Marshal.dump(result, write_io)
+
+        # We're done sending results to the parent so it's safe to close the
+        # IO object now.
+        write_io.close
+
+        # Exit the child process as its job is now done.
+        exit
       end
 
-      # Define a new version of run_one_method that forks, calls the original
-      # run_one_method in the child process, and sends results back to the
-      # parent. klass and method_name are the two parameters accepted by the
-      # original run_one_method - they're the test class (e.g. UserTest) and
-      # the test method name (e.g. :test_email_must_be_unique).
-      Minitest.define_singleton_method(:run_one_method) do |klass, method_name|
-        # Set up a binary pipe for transporting test results from the child
-        # to the parent process.
-        read_io, write_io = IO.pipe
-        read_io.binmode
-        write_io.binmode
-
-        if Process.fork
-          # The parent process responsible for collecting results.
-
-          # The parent process doesn't write anything.
-          write_io.close
-
-          # Load the result object passed by the child process.
-          result = Marshal.load(read_io)
-
-          # Unwrap all failures from FailureTransport so that they can be
-          # safely presented to the user.
-          result.failures.map!(&:failure)
-
-          # We're done reading results from the child so it's safe to close the
-          # IO object now.
-          read_io.close
-
-          # Wait for the child process to finish before returning the result.
-          Process.wait
-        else
-          # The child process responsible for running the test case.
-
-          # Run the test case method via the original .run_one_method.
-          result = original_run_one_method.call(klass, method_name)
-
-          # Wrap failures in FailureTransport to avoid issue when marshalling.
-          # Some failures correspond to exceptions referencing unmarshallable
-          # objects. For example, a PostgreSQL exception may reference
-          # PG::Connection that cannot be marshalled. In those case, we replace
-          # the original error with UnmarshallableError retaining as much
-          # detail as possible.
-          result.failures.map! { |failure| FailureTransport.new(failure) }
-
-          # The child process doesn't read anything.
-          read_io.close
+      # This value is returned ONLY in the parent process, not in the child
+      # process.
+      result
+    end
 
-          # Dump the result object to the write IO object so that it can be
-          # read by the parent process.
-          Marshal.dump(result, write_io)
+    # #start is called by Minitest when initializing the executor. This is where
+    # we override some Minitest internals to implement fork-based execution.
+    def start
+      if Minitest.respond_to?(:run_one_method)
+        # Minitest 5
 
-          # We're done sending results to the parent so it's safe to close the
-          # IO object now.
-          write_io.close
+        # Store the reference to the original run_one_method method in order to
+        # use it to actually run the test case.
+        original_run_one_method = Minitest.method(:run_one_method)
 
-          # Exit the child process as its job is now done.
-          exit
+        # Remove the original singleton method from Minitest in order to avoid
+        # method redefinition warnings when patching it in the next step.
+        class << Minitest
+          remove_method(:run_one_method)
         end
 
-        # This value is returned ONLY in the parent process, not in the child
-        # process.
-        result
+        # Define a new version of run_one_method that forks, calls the original
+        # run_one_method in the child process, and sends results back to the
+        # parent. klass and method_name are the two parameters accepted by the
+        # original run_one_method - they're the test class (e.g. UserTest) and
+        # the test method name (e.g. :test_email_must_be_unique).
+        Minitest.define_singleton_method(:run_one_method) do |klass, method_name|
+          ForkExecutor.run do
+            original_run_one_method.call(klass, method_name)
+          end
+        end
+      else
+        # Minitest 6
+
+        Runnable.runnables.each do |runnable_class|
+          original_run_method = runnable_class.instance_method(:run)
+          runnable_class.define_method(:run) do
+            bound_original_run_method = original_run_method.bind(self)
+            ForkExecutor.run do
+              bound_original_run_method.call
+            end
+          end
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-fork_executor
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Greg Navis
@@ -28,16 +28,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.2.1
+        version: 13.0.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Run each test_* method in a separate process thus eliminating test case
   interference.
 email: contact@gregnavis.com
@@ -67,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Near-perfect process-level test case isolation.