forking_test_runner 1.7.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5941690d477f2dcded481eb639078719303e399fce77bf0f3dfd4a8d29281466
-  data.tar.gz: 4d007910130e2d2f7444df0bad571f23d623dbe63609e3f5389bdd2ebfa838ce
+  metadata.gz: be87df3e12024204491610717130bc0b71a3b7fc02d6a60c82da34ebedbf74c6
+  data.tar.gz: 4e6fb9c449dc7e00c46e39fdbc7686bcfe0bf1df439c800e78767950a517f6c4
 SHA512:
-  metadata.gz: bc9419382a7dadaa81fad1b498d2ed3b5cd6b8c4bfa4727b1bddee0203b3ed1a87133218fd4610e2adf94043cb2be07ac733fc92613ffc9d83cfef05468c330c
-  data.tar.gz: 247bec8782245d23d487e32e2b65a1bd8eee0f04458abf8f66c14cec083de865f4cc107af370b39f837dcc674f18d3c67075eb293616ea2a4a6f79457b14d2ef
+  metadata.gz: 323f765b32f2ed37f62a82dfff10b6bdc7c0c8670a441f340f2a910d8dfb17a9660726698b8c34dfb89522246003e8c7fde4a205d17b8511c3ec432027604a65
+  data.tar.gz: ad243eb959c09b3bac8d58da961adec4c34b92844b239da2e541d599e2f1b78d738bdc3cc5db7b44c4817e18aa99be86d5adb74bac2e5614c01b57c027a0b562

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
@@ -250,7 +253,7 @@ module ForkingTestRunner
     def fork_with_captured_stdout
       rpipe, wpipe = IO.pipe
 
-      child = fork do
+      child = Process.fork do
         rpipe.close
         preserve_tty { $stdout.reopen(wpipe) }
         yield
@@ -279,7 +282,13 @@ module ForkingTestRunner
     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
+          if defined?(SimpleCov)
+            SimpleCov.pid = Process.pid
+            SimpleCov.command_name file
+          end
+          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
@@ -291,6 +300,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
@@ -351,5 +364,28 @@ module ForkingTestRunner
         end
       end
     end
+
+    def summarize_partial_reports
+      reports = Dir.glob("#{CONVERAGE_REPORT_PREFIX}*")
+      return if reports.empty?
+      key = nil
+
+      require "json" # not a global dependency
+      coverage = reports.each_with_object({}) do |report, all|
+        data = JSON.parse(File.read(report), symbolize_names: true)
+        key ||= data.keys.first
+        suites = data.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(key => {"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,7 @@ 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"],
       [
         :record_runtime,
         "--record-runtime=MODE",

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,3 @@
 module ForkingTestRunner
-  VERSION = "1.7.0"
+  VERSION = "1.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-23 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.7
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  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'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -133,14 +119,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.1.3
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Run every test in a fork to avoid pollution and get clean output per test