forking_test_runner 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7dc622ff1b3350704d3ccf31cf25c1d51b13ee4
-  data.tar.gz: 5cdb2b8430b13547d2cafcb9cbaa752565fad7db
+  metadata.gz: 691b5e04b0f5d69105cfd566e00c7c080dcedba2
+  data.tar.gz: fac4175373591f336a5d15aa946c8333032aab49
 SHA512:
-  metadata.gz: 1e45ea05cbbb26bebb567c1462026648a980a0f4dde7bc0b5bad0093c85459a01e28d7ab5dcf7dd5edd72597e25ae742e455fc8973f2d55aef750c96e4f02a26
-  data.tar.gz: 9f27f7a7a11484da1548c838553e8d5b08249e405491d7d30f8f96a91d4e2351efa40a21e091d1395253deb6ccb8c29322d4f0f9c4ab09e653d17bdb94636369
+  metadata.gz: 169eaf23e55d0ef7930cd04dbab2d3017940c51fc4fafb0efe81fb1e27ae4954229d87f9cb3ea3fa9a901a2ed364ae78e72d886963bb0777333dff474d6f98b2
+  data.tar.gz: 2a3e69f9865c50d8cc46e26c9075a2a9169c5a3b80c1bc49a7a37b54c89ea03382b8a541fe3354389e6cf1bce0c697dfb9c22db3011d7f0ccace44b997d08d98

data/bin/forking-test-runner

@@ -5,51 +5,4 @@ root = File.expand_path("../..", __FILE__)
 $LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
 
 require 'forking_test_runner'
-
-ForkingTestRunner.disable_minitest_autorun
-
-runtime_log = ForkingTestRunner.delete_argv("--runtime-log", ARGV)
-helper = ForkingTestRunner.delete_argv("--helper", ARGV) || "test/test_helper"
-
-require "./#{helper}"
-
-tests = ForkingTestRunner.find_tests_for_group(ARGV, runtime_log)
-puts "Running tests #{tests.map(&:first).join(" ")}"
-
-show_time = tests[0][1]
-
-clear = "------"
-results = tests.map do |file, expected|
-  puts "#{clear} >>> #{file}"
-  success = false
-  time = Benchmark.realtime do
-    success = ForkingTestRunner.run_test(file)
-  end
-  puts "Time: expected #{expected.round(2)}, actual #{time.round(2)}" if show_time
-  puts "#{clear} <<< #{file} ---- #{success ? "OK" : "Failed"}"
-  [file, time, expected, success]
-end
-
-puts "\nResults:"
-puts results.map { |f,_,_,r| "#{f}: #{r ? "OK" : "Fail"}"}
-
-if show_time
-  puts "Time: #{results.map { |_,time,expected,_| time - expected }.inject(:+).to_f.round(2)} diff to expected"
-end
-
-# log runtime and then curl it into the runtime log location
-if ENV["RECORD_RUNTIME"]
-  require 'tempfile'
-  slug = ENV.fetch("TRAVIS_REPO_SLUG").sub("/", "-")
-  id = ENV.fetch("TRAVIS_BUILD_NUMBER")
-  url = "https://amend.herokuapp.com/amend/#{slug}-#{id}"
-  data = results.map { |f,time,_,_| "#{f}:#{time.round(2)}" }.join("\n") << "\n"
-  Tempfile.open("runtime.log") do |f|
-    f.write(data)
-    f.close
-    result = `curl -X POST --data-binary @#{f.path} #{url}`
-    puts "amended runtime log\ncurl #{url} | sort > #{runtime_log}\nStatus: #{$?.success?}\nResponse: #{result}"
-  end
-end
-
-exit(results.map(&:last).all? ? 0 : 1)
+exit ForkingTestRunner.cli(ARGV)

data/lib/forking_test_runner.rb

@@ -1,8 +1,109 @@
 module ForkingTestRunner
+  CLEAR = "------"
+
   class << self
-    # This forces Rails to load all fixtures, then prevents it from deleting and then
-    # re-inserting all fixtures when a test is run.
-    # Saves us a couple of seconds when the test includes a call to fixtures :all.
+    def cli(argv)
+      disable_minitest_autorun
+      load_test_env(delete_argv("--helper", argv))
+
+      # figure out what we need to run
+      record_runtime = delete_argv("--record-runtime", argv)
+      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(" ")}"
+
+      # 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]
+      end
+
+      # pretty print the results
+      puts "\nResults:"
+      puts results.map { |f,_,_,r| "#{f}: #{r ? "OK" : "Fail"}"}
+
+      if runtime_log
+        # show how long they ran vs expected
+        diff = results.map { |_,time,expected,_| time - expected }.inject(:+).to_f
+        puts "Time: #{diff.round(2)} diff to expected"
+      end
+
+      if record_runtime
+        # store runtime log
+        log = runtime_log || 'runtime.log'
+        record_test_runtime(record_runtime, results, log)
+      end
+
+      # exit with success or failure
+      results.map(&:last).all? ? 0 : 1
+    end
+
+    private
+
+    def benchmark
+      result = false
+      time = Benchmark.realtime do
+        result = yield
+      end
+      return time, result
+    end
+
+    # log runtime via dumping or curling it into the runtime log location
+    def record_test_runtime(mode, results, log)
+      data = results.map { |test, time| "#{test}:#{time.round(2)}" }.join("\n") << "\n"
+
+      case mode
+      when 'simple'
+        File.write(log, data)
+      when 'amend'
+        slug = ENV.fetch("TRAVIS_REPO_SLUG").sub("/", "-")
+        id = ENV.fetch("TRAVIS_BUILD_NUMBER")
+        url = "https://amend.herokuapp.com/amend/#{slug}-#{id}"
+
+        require 'tempfile'
+        Tempfile.open("runtime.log") do |f|
+          f.write(data)
+          f.close
+          result = `curl -X POST --data-binary @#{f.path} #{url}`
+          puts "amended runtime log\ncurl #{url} | sort > #{log}\nStatus: #{$?.success?}\nResponse: #{result}"
+        end
+      else
+        raise "Unsupported record-runtime flag: #{mode}"
+      end
+    end
+
+    def extract_group_args(argv)
+      if argv.include?("--group")
+        # delete options we want while leaving others as they are (-v / --seed etc)
+        group, group_count = ['--group', '--groups'].map do |arg|
+          value = delete_argv(arg, argv) || raise("Did not find option #{arg}")
+          value.to_i
+        end
+        dir = argv.shift
+        raise "Unable to find directory #{dir.inspect}" unless File.exist?(dir.to_s)
+        tests = [dir]
+      else
+        group = 1
+        group_count = 1
+        size = argv.index("--") || argv.size
+        tests = argv.slice!(0, size)
+        argv.shift # remove --
+      end
+
+      [group, group_count, tests]
+    end
+
+    def load_test_env(helper=nil)
+      helper = helper || "test/test_helper"
+      require "./#{helper}"
+    end
+
+    # This forces Rails to load all fixtures, then prevents it from
+    # "deleting and re-inserting all fixtures" when a new connection is used (forked).
     def preload_fixtures
       return if @preloaded
       @preloaded = true
@@ -28,7 +129,7 @@ module ForkingTestRunner
       toggle_minitest_autorun false
     end
 
-    def enabled_minitest_autorun
+    def enable_minitest_autorun
       toggle_minitest_autorun true
     end
 
@@ -38,36 +139,24 @@ module ForkingTestRunner
       child = fork do
         key = (ActiveRecord::VERSION::STRING >= "4.1.0" ? :test : "test")
         ActiveRecord::Base.establish_connection key
-        enabled_minitest_autorun
+        enable_minitest_autorun
         require "./#{file}"
       end
       Process.wait(child)
       $?.success?
     end
 
-    def find_tests_for_group(argv, runtime_log)
+    def find_tests_for_group(group, group_count, tests, runtime_log)
       require 'parallel_tests/test/runner'
 
-      if argv.include?("--group")
-        # delete options we want while leaving others as they are (-v / --seed etc)
-        group, number_of_groups = ['--group', '--groups'].map do |arg|
-          value = delete_argv(arg, argv) || raise("Did not find option #{arg}")
-          value.to_i
-        end
-        dir = ARGV.shift
-        raise "Unable to find directory #{dir.inspect}" unless File.exist?(dir.to_s)
-        tests = [dir]
-      else
-        group = 1
-        number_of_groups = 1
-        size = argv.index("--") || argv.size
-        tests = argv.slice!(0, size)
-        argv.shift # remove --
-      end
-
       group_by = (runtime_log ? :runtime : :filesize)
-      tests = ParallelTests::Test::Runner.send(:tests_with_size, tests, runtime_log: runtime_log, group_by: group_by)
-      groups = ParallelTests::Grouper.in_even_groups_by_size(tests, number_of_groups, {})
+      tests = ParallelTests::Test::Runner.send(
+        :tests_with_size,
+        tests,
+        runtime_log: runtime_log,
+        group_by: group_by
+      )
+      groups = ParallelTests::Grouper.in_even_groups_by_size(tests, group_count, {})
       group = groups[group - 1] || raise("Group #{group} not found")
 
       # return tests with runtime
@@ -75,14 +164,12 @@ module ForkingTestRunner
       group.map { |test| [test, (tests[test] if group_by == :runtime)] }
     end
 
-    def delete_argv(arg, argv)
-      return unless index = argv.index(arg)
-      argv.delete_at(index)
+    def delete_argv(name, argv)
+      return unless index = argv.index(name)
       argv.delete_at(index)
+      argv.delete_at(index) || raise("Missing argument for #{name}")
     end
 
-    private
-
     def toggle_minitest_autorun(value)
       klass = begin
         require 'minitest/unit' # only exists on 4

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,3 @@
 module ForkingTestRunner
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="