forking_test_runner 1.5.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da329d4d34a62e5506ea5503521ee68d46b6d113a36e57d93e732feb9d5fdd52
-  data.tar.gz: 0d264d60aba634760d5670dcdb050305ce3f68ffa8023528a788c66ff0012ff9
+  metadata.gz: 1839ef1db8973b5e282bbf3998915649fa16448e12d6c56e11fda8b0d1f4d2a8
+  data.tar.gz: 8d3f007a2149807efd62c4e1ff4b9a287c54055aebc3760b6bd3300d5844e8bf
 SHA512:
-  metadata.gz: 1fd169253d7e50b752d9e866ec8180eb4009f38354f931ce8e6f764743f9c51627ac94949a131a079a6a760f9473fbafac370c40f514aabbb782c8acdfd7b3a4
-  data.tar.gz: 9c67fa682ea9ea43f888b347ee6ec8a75c00a3d3ca2f4288b414b4fc17573a6fc877e825fc82775c7620a907d543607996d12174630fd7ecfb811d58ffe7aeca
+  metadata.gz: 4939fa2877d285718946f957082a2129b17d4d20d7cce27050709d81d4c410bd50c455af8c2d546a3ebeaaa76a7ac047859883ea1b780102f8af63ac12ae14a5
+  data.tar.gz: 25caf6564292c4cd5d74b9214879d514b6d9b49ac11c8bcf9e3e1407e0550ece85d92f6ed3395015ff028b1c654578d9d05d17f2b708c9e6e59ffdf590a49d3e

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)
@@ -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,33 @@ 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
+
+      # report only line coverage to be backwards compatible for some coverage backends
+      coverage.transform_values! { |v| v.is_a?(Hash) ? v.fetch(:lines) : v } if @options[:report_line_coverage]
+
+      # chose "Minitest" because it is what simplecov uses for reports and "Unit Tests" makes sonarqube break
+      data = JSON.pretty_generate("Minitest" => {"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/cli.rb

@@ -7,7 +7,8 @@ module ForkingTestRunner
       [:quiet, "--quiet", "Quiet"],
       [:no_fixtures, "--no-fixtures", "Do not load fixtures"],
       [:no_ar, "--no-ar", "Disable ActiveRecord logic"],
-      [:merge_coverage, "--merge-coverage", "Merge base code coverage into indvidual files coverage, great for SingleCov"],
+      [:merge_coverage, "--merge-coverage", "Merge base code coverage into individual files coverage and summarize coverage report"],
+      [:report_line_coverage, "--report-line-coverage", "Convert coverage report to line coverage (for compatibility)"],
       [
         :record_runtime,
         "--record-runtime=MODE",

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,3 @@
 module ForkingTestRunner
-  VERSION = "1.5.2"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 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