forking_test_runner 1.5.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef9594eb4e2644f8afa4ace2ecafc1f71eef58258297a9a3a425749669310908
-  data.tar.gz: f3f1a73b501941fa9dd01b93324ca294f05337dc9643777ac1113b79e1d22a53
+  metadata.gz: 33abc47d33141843b1d89ce17adee27897c64bc3445d9567845194aaa9f07224
+  data.tar.gz: a61958472117f965f21e354ce7f874f7ea920a76503589b5dd36e0a6f21eb7c7
 SHA512:
-  metadata.gz: 3fcc2695e506ca3360561436d55dd01117aae03c033b1b60ad3147acd59bf8cd278aff0e386db75dd9847f85b8528829a007ed6bb5b28d0ea2f78f88881ce95a
-  data.tar.gz: efff54891fd50adbe0311e63068dc6fe5c131e6e4557ae3f5369790c68344bca7139138e85af70599d974eab57f65b4813ae8102cf9b8012ed8a61d491b328be
+  metadata.gz: 59f31396b4c6ccdce8cb625aebdea2b3f2a49c6e91983990f2b93e386c19f8e6ef94100d8ca0482a0e82cec2450fb1a5db1a47c42566749b69d7324543676c87
+  data.tar.gz: 32bbc0a83affacf06da8943e9a592152841ead2d7180aabe201031934d68705ac9e769c9c75b33b13b0a4b1587f6795fb38bbdb44c145f4e5c3de74bd698dab3

data/lib/forking_test_runner.rb

@@ -8,6 +8,7 @@ require 'tempfile'
 
 module ForkingTestRunner
   CLEAR = "------"
+  CONVERAGE_REPORT_PREFIX = "coverage/fork-"
 
   class << self
     def cli(argv)
@@ -21,7 +22,7 @@ module ForkingTestRunner
         if parallel && !@options.fetch(:group)
           Array.new(parallel) { |i| find_tests_for_group(i + 1, parallel, tests, runtime_log) }
         else
-          raise ArgumentError, "Use the same amount of processors as groups" if parallel && parallel != group_count
+          raise ArgumentError, "Use the same amount of processors as groups" if parallel && parallel != groups.count
           groups.map { |group| find_tests_for_group(group, group_count, tests, runtime_log) }
         end
 
@@ -79,6 +80,8 @@ module ForkingTestRunner
         record_test_runtime(mode, results, log)
       end
 
+      summarize_partial_reports if partial_reports_for_single_cov?
+
       # exit with success or failure
       success ? 0 : 1
     end
@@ -252,8 +255,7 @@ module ForkingTestRunner
 
       child = fork do
         rpipe.close
-        $stdout.reopen(wpipe)
-
+        preserve_tty { $stdout.reopen(wpipe) }
         yield
       end
 
@@ -270,10 +272,20 @@ module ForkingTestRunner
       buffer
     end
 
+    # not tested via CI
+    def preserve_tty
+      was_tty = $stdout.tty?
+      yield
+      def $stdout.tty?; true; end if was_tty
+    end
+
     def run_test(file)
       stdout = change_program_name_to file do
         fork_with_captured_stdout do
-          SimpleCov.pid = Process.pid if defined?(SimpleCov) && SimpleCov.respond_to?(:pid=) # trick simplecov into reporting in this fork
+          SimpleCov.pid = Process.pid if defined?(SimpleCov) && SimpleCov.respond_to?(:pid=) # make simplecov report in this fork
+          if partial_reports_for_single_cov?
+            SingleCov.coverage_report = "#{CONVERAGE_REPORT_PREFIX}#{Process.pid}.json"
+          end
           if active_record?
             key = (ActiveRecord::VERSION::STRING >= "4.1.0" ? :test : "test")
             ActiveRecord::Base.establish_connection key
@@ -285,6 +297,10 @@ module ForkingTestRunner
       [$?.success?, stdout]
     end
 
+    def partial_reports_for_single_cov?
+      @options.fetch(:merge_coverage) && defined?(SingleCov) && SingleCov.respond_to?(:coverage_report=) && SingleCov.coverage_report
+    end
+
     def change_program_name_to(name)
       return yield if @options.fetch(:parallel)
       begin
@@ -341,9 +357,29 @@ module ForkingTestRunner
 
         if value
           minitest_class.autorun
-          require(file.start_with?('/') ? file : "./#{file}")
+          load file
         end
       end
     end
+
+    def summarize_partial_reports
+      reports = Dir.glob("#{CONVERAGE_REPORT_PREFIX}*")
+      return if reports.empty?
+
+      require "json" # not a global dependency
+      coverage = reports.each_with_object({}) do |report, all|
+        suites = JSON.parse(File.read(report), symbolize_names: true).values
+        raise "Unsupported number of suites #{suites.size}" if suites.size != 1
+        all.replace CoverageCapture.merge_coverage(all, suites.first.fetch(:coverage))
+      ensure
+        File.unlink(report) # do not leave junk behind
+      end
+
+      data = JSON.pretty_generate("Unit Tests" => {"coverage" => coverage, "timestamp" => Time.now.to_i })
+      File.write(SingleCov.coverage_report, data)
+
+      # make it not override our report when it finishes for main process
+      SingleCov.coverage_report = nil
+    end
   end
 end

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,3 @@
 module ForkingTestRunner
-  VERSION = "1.5.1"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -133,14 +133,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Run every test in a fork to avoid pollution and get clean output per test