forking_test_runner 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 526b183c2e01a812e6598740d3793c7f066b7388
-  data.tar.gz: 0773d4da8e38e74bf76b612064d9cef46af361d0
+  metadata.gz: de99eb6c9f92a0d16b7b0e85053449bce2418a30
+  data.tar.gz: bca4f9f34d9fff0a2bc665e680934403edfe71fa
 SHA512:
-  metadata.gz: 30723e795b02d4c3fbdb3d61790206dc965a9d7a11bebe92589589b43a4e0d31dea2f052f81d0b3ae09e265401b272726395966929692f0f83838c95c93f0936
-  data.tar.gz: 5e0cd98d64fcf90c578a2af9a584666a17a2561878840cfa8390931c753d3c901fdf2a58f83cdb69c6c8077d7d0e6495419010eb60a8a3f08e1c3e5d8d248810
+  metadata.gz: 447e4dd3336ee76632a7f5c20ce3e7a92509c37ddd3e4123557e9ec74f0dd6c653116cde1e87e557ad8a8013c332b15a29c2e2e4e35b22f7976f62baedf76fff
+  data.tar.gz: 342d7b3bbafbddf334c778b27ed7fa3ab71b2a45a3cfc879fd994fc157a024f33994087bff40102b874c2cbf72b7842ba964907fae39ef2876e3abd1bf03854a

data/lib/forking_test_runner.rb

@@ -8,7 +8,10 @@ module ForkingTestRunner
       @rspec = delete_argv("--rspec", argv, arg: false)
       @no_fixtures = delete_argv("--no-fixtures", argv, arg: false)
 
+      @quiet = delete_argv("--quiet", argv, arg: false)
+
       disable_test_autorun
+
       load_test_env(delete_argv("--helper", argv))
 
       # figure out what we need to run
@@ -16,26 +19,43 @@ module ForkingTestRunner
       runtime_log = delete_argv("--runtime-log", argv)
       group, group_count, tests = extract_group_args(argv)
       tests = find_tests_for_group(group, group_count, tests, runtime_log)
-      puts "Running tests #{tests.map(&:first).join(" ")}"
+
+      if @quiet
+        puts "Running #{tests.size} test files"
+      else
+        puts "Running tests #{tests.map(&:first).join(" ")}"
+      end
 
       # run all the tests
       results = tests.map do |file, expected|
-        puts "#{CLEAR} >>> #{file}"
-        time, success = benchmark { run_test(file) }
-        puts "Time: expected #{expected.round(2)}, actual #{time.round(2)}" if runtime_log
-        puts "#{CLEAR} <<< #{file} ---- #{success ? "OK" : "Failed"}"
-        [file, time, expected, success]
+        puts "#{CLEAR} >>> #{file} "
+        time, success, output = benchmark { run_test(file) }
+
+        puts output if !success && @quiet
+
+        unless @quiet
+          puts "Time: expected #{expected.round(2)}, actual #{time.round(2)}" if runtime_log
+          puts "#{CLEAR} <<< #{file} ---- #{success ? "OK" : "Failed"}"
+        end
+        [file, time, expected, output, success]
       end
 
-      # pretty print the results
-      puts "\nResults:"
-      puts results.
-        sort_by { |_,_,_,r| r ? 0 : 1 }. # failures should be last so they are easy to find
-        map { |f,_,_,r| "#{f}: #{r ? "OK" : "Fail"}"}
+      unless @quiet
+        # pretty print the results
+        puts "\nResults:"
+        puts results.
+          sort_by { |_,_,_,_,r| r ? 0 : 1 }. # failures should be last so they are easy to find
+          map { |f,_,_,_,r| "#{f}: #{r ? "OK" : "Fail"}"}
+        puts
+      end
+
+      success = results.map(&:last).all?
+
+      puts colorize(success, summarize_results(results.map { |r| r[3] }))
 
       if runtime_log
         # show how long they ran vs expected
-        diff = results.map { |_,time,expected,_| time - expected }.inject(:+).to_f
+        diff = results.map { |_,time,expected| time - expected }.inject(:+).to_f
         puts "Time: #{diff.round(2)} diff to expected"
       end
 
@@ -46,17 +66,37 @@ module ForkingTestRunner
       end
 
       # exit with success or failure
-      results.map(&:last).all? ? 0 : 1
+      success ? 0 : 1
     end
 
     private
 
+    def colorize(green, string)
+      if $stdout.tty?
+        "\e[#{green ? 32 : 31}m#{string}\e[0m"
+      else
+        string
+      end
+    end
+
+    def summarize_results(results)
+      runner = if @rspec
+        require 'parallel_tests/test/runner'
+        ParallelTests::Test::Runner
+      else
+        require 'parallel_tests/rspec/runner'
+        ParallelTests::RSpec::Runner
+      end
+
+      runner.summarize_results(results.map { |r| runner.find_results(r) })
+    end
+
     def benchmark
       result = false
       time = Benchmark.realtime do
         result = yield
       end
-      return time, result
+      return [time, result].flatten
     end
 
     # log runtime via dumping or curling it into the runtime log location
@@ -141,13 +181,37 @@ module ForkingTestRunner
       toggle_test_autorun true, file
     end
 
+    def fork_with_captured_output(tee_to_stdout)
+      rpipe, wpipe = IO.pipe
+
+      child = fork do
+        rpipe.close
+        $stdout.reopen(wpipe)
+
+        yield
+      end
+
+      wpipe.close
+
+      buffer = ""
+
+      while ch = rpipe.read(1)
+        buffer << ch
+        $stdout.write(ch) if tee_to_stdout
+      end
+
+      Process.wait(child)
+      buffer
+    end
+
     def run_test(file)
       if ar?
         preload_fixtures
         ActiveRecord::Base.connection.disconnect!
       end
-      change_program_name_to file do
-        child = fork do
+
+      output = change_program_name_to file do
+        fork_with_captured_output(!@quiet) do
           SimpleCov.pid = Process.pid if defined?(SimpleCov) && SimpleCov.respond_to?(:pid=) # trick simplecov into reporting in this fork
           if ar?
             key = (ActiveRecord::VERSION::STRING >= "4.1.0" ? :test : "test")
@@ -155,9 +219,9 @@ module ForkingTestRunner
           end
           enable_test_autorun(file)
         end
-        Process.wait(child)
       end
-      $?.success?
+
+      [$?.success?, output]
     end
 
     def change_program_name_to(name)
@@ -199,6 +263,20 @@ module ForkingTestRunner
       defined?(ActiveRecord::Base)
     end
 
+    def minitest_class
+      @minitest_class ||= begin
+        require 'bundler/setup'
+        gem 'minitest'
+        if Gem.loaded_specs["minitest"].version.segments.first == 4 # 4.x
+          require 'minitest/unit'
+          MiniTest::Unit
+        else
+          require 'minitest'
+          Minitest
+        end
+      end
+    end
+
     def toggle_test_autorun(value, file=nil)
       if @rspec
         if value
@@ -211,22 +289,10 @@ module ForkingTestRunner
           $LOAD_PATH.unshift "./spec"
         end
       else
-        @minitest_class ||= begin
-          require 'bundler/setup'
-          gem 'minitest'
-          if Gem.loaded_specs["minitest"].version.segments.first == 4 # 4.x
-            require 'minitest/unit'
-            MiniTest::Unit
-          else
-            require 'minitest'
-            Minitest
-          end
-        end
-
-        @minitest_class.class_variable_set("@@installed_at_exit", !value)
+        minitest_class.class_variable_set("@@installed_at_exit", !value)
 
         if value
-          @minitest_class.autorun
+          minitest_class.autorun
           require "./#{file}"
         end
       end

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,3 @@
 module ForkingTestRunner
-  VERSION = "0.4.6"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Run every test in a fork to avoid pollution and get clean output per test