parallel_tests 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906e4b29ac1f504f1abb438ef730e5ae7a7076e1
-  data.tar.gz: fcc5d45823c76190851fd0f340b98b99d00b4a55
+  metadata.gz: eb03b149858850d173e253b5f221955c78308d31
+  data.tar.gz: 2b7ab7a8bc2404f4753d098becf7d317470e4a5b
 SHA512:
-  metadata.gz: db53a0c8a8a517a3d6464845b0b6604a8a34377b61e60139e52a30f7aae2939f8db9096a4b1e6568bd16f33bdab85579b26ab393b68d5d59057addfd52a07e9c
-  data.tar.gz: b1a64ce20f6ad0d057edbb8e354a99604371546b0b6caf824ba316ae375b1acc4d94f59b7665e81b6394611586ba49183f74b4b480320a98cb8c04a56a81055e
+  metadata.gz: 3505c81d9d74cded2d43af6c94260d06090e2d0aff0b10ea49af3f2411471190ea84516841c2a5df819cea1fe437320b4711e3beaf98a0d9fd40aac813a36ded
+  data.tar.gz: f1e93029650eca41352d4b5feac1fc663a6405ec6daef96116f24b58ae1f274bbdf906da26cabcf6151b72abd6a949b55cb3a3f974f3997ad7f8b91957b83768

data/Readme.md

@@ -99,14 +99,15 @@ Rspec: Add to your `.rspec_parallel` (or `.rspec`) :
     --format progress
     --format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
 
-### Test::Unit & Minitest 4
+### Test::Unit & Minitest 4/5
 
 Add to your `test_helper.rb`:
 ```ruby
-require 'parallel_tests/test/runtime_logger'
+require 'parallel_tests/test/runtime_logger' if ENV['RECORD_RUNTIME']
 ```
 
-results will be logged to tmp/parallel_runtime_test.log
+results will be logged to tmp/parallel_runtime_test.log when `RECORD_RUNTIME` is set,
+so it is not always required or overwritten.
 
 RSpec: SummaryLogger
 --------------------
@@ -175,7 +176,8 @@ Options are:
           steps - number of cucumber/spinach steps
           scenarios - individual cucumber scenarios
           filesize - by size of the file
-          default - runtime or filesize
+          runtime - info from runtime log
+          default - runtime when runtime log is filled otherwise filesize
     -m, --multiply-processes [FLOAT] use given number as a multiplier of processes to run
     -s, --single [PATTERN]           Run all matching files in the same process
     -i, --isolate                    Do not run any other tests in the group used by --single(-s)
@@ -306,6 +308,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Volodymyr Mykhailyk](https:/github.com/volodymyr-mykhailyk)
  - [Mike Mueller](https://github.com/mmueller)
  - [Aaron Jensen](https://github.com/aaronjensen)
+ - [Ed Slocomb](https://github.com/edslocomb)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cli.rb

@@ -108,7 +108,8 @@ module ParallelTests
                     steps - number of cucumber/spinach steps
                     scenarios - individual cucumber scenarios
                     filesize - by size of the file
-                    default - runtime or filesize
+                    runtime - info from runtime log
+                    default - runtime when runtime log is filled otherwise filesize
           TEXT
           ) { |type| options[:group_by] = type.to_sym }
         opts.on("-m [FLOAT]", "--multiply-processes [FLOAT]", Float, "use given number as a multiplier of processes to run") { |multiply| options[:multiply] = multiply }
@@ -162,7 +163,10 @@ module ParallelTests
       options[:group_by] ||= :filesize if options[:only_group]
 
       raise "--group-by found and --single-process are not supported" if options[:group_by] == :found and options[:single_process]
-      raise "--group-by filesize is required for --only-group" if options[:group_by] != :filesize and options[:only_group]
+      allowed = [:filesize, :runtime, :found]
+      if !allowed.include?(options[:group_by]) && options[:only_group]
+        raise "--group-by #{allowed.join(" or ")} is required for --only-group"
+      end
 
       options
     end

data/lib/parallel_tests/test/runner.rb

@@ -41,13 +41,26 @@ module ParallelTests
         def tests_in_groups(tests, num_groups, options={})
           tests = find_tests(tests, options)
 
-          tests = if options[:group_by] == :found
-            tests.map { |t| [t, 1] }
-          elsif options[:group_by] == :filesize
-            with_filesize_info(tests)
+          case options[:group_by]
+          when :found
+            tests.map! { |t| [t, 1] }
+          when :filesize
+            sort_by_filesize(tests)
+          when :runtime
+            sort_by_runtime(tests, runtimes(options), allowed_missing: 0.5)
+          when nil
+            # use recorded test runtime if we got enough data
+            runtimes = runtimes(options) rescue []
+            if runtimes.size * 1.5 > tests.size
+              puts "Using recorded test runtime"
+              sort_by_runtime(tests, runtimes)
+            else
+              sort_by_filesize(tests)
+            end
           else
-            with_runtime_info(tests, options)
+            raise ArgumentError, "Unsupported option #{options[:group_by]}"
           end
+
           Grouper.in_even_groups_by_size(tests, num_groups, options)
         end
 
@@ -136,28 +149,33 @@ module ParallelTests
           result
         end
 
-        def with_runtime_info(tests, options = {})
-          log = options[:runtime_log] || runtime_log
-          lines = File.read(log).split("\n") rescue []
-
-          # use recorded test runtime if we got enough data
-          if lines.size * 1.5 > tests.size
-            puts "Using recorded test runtime: #{log}"
-            times = Hash.new(1)
-            lines.each do |line|
-              test, time = line.split(":")
-              next unless test and time
-              times[test] = time.to_f
-            end
-            tests.sort.map { |test| [test, times[test]] }
-          else # use file sizes
-            with_filesize_info(tests)
+        def sort_by_runtime(tests, runtimes, options={})
+          allowed_missing = options[:allowed_missing] || 1.0
+          allowed_missing = tests.size * allowed_missing
+
+          times = {}
+          runtimes.each do |line|
+            test, time = line.split(":", 2)
+            next unless test and time
+            times[test] = time.to_f
           end
+
+          tests.sort!
+          tests.map! do |test|
+            allowed_missing -= 1 unless time = times[test]
+            raise "Too little runtime info" if allowed_missing < 0
+            [test, time || 1]
+          end
+        end
+
+        def runtimes(options)
+          log = options[:runtime_log] || runtime_log
+          File.read(log).split("\n")
         end
 
-        def with_filesize_info(tests)
-          # use filesize to group files
-          tests.sort.map { |test| [test, File.stat(test).size] }
+        def sort_by_filesize(tests)
+          tests.sort!
+          tests.map! { |test| [test, File.stat(test).size] }
         end
 
         def find_tests(tests, options = {})

data/lib/parallel_tests/test/runtime_logger.rb

@@ -71,7 +71,25 @@ module ParallelTests
   end
 end
 
-if defined?(MiniTest::Unit)
+if defined?(Minitest::Test) # Minitest 5
+  class << Minitest::Runnable
+    alias_method :run_without_runtime_log, :run
+    def run(*args)
+      ParallelTests::Test::RuntimeLogger.log_test_run(self) do
+        run_without_runtime_log(*args)
+      end
+    end
+  end
+
+  class << Minitest
+    alias_method :run_without_runtime_log, :run
+    def run(*args)
+      result = run_without_runtime_log(*args)
+      ParallelTests::Test::RuntimeLogger.unique_log
+      result
+    end
+  end
+elsif defined?(MiniTest::Unit) # Minitest 4
   MiniTest::Unit.class_eval do
     alias_method :_run_suite_without_runtime_log, :_run_suite
     def _run_suite(*args)
@@ -87,7 +105,7 @@ if defined?(MiniTest::Unit)
       result
     end
   end
-else
+else # Test::Unit
   require 'test/unit/testsuite'
   class ::Test::Unit::TestSuite
     alias_method :run_without_timing, :run

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '1.3.1'
+  VERSION = Version = '1.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel