parallel_tests 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 352fa864d70d787e50eb44c7c47c1b2d2bade48d
-  data.tar.gz: cb300796822d200a52b06ffc78fbde18cc443898
+  metadata.gz: b57802f4d3da910095fefb6c49645784d566ae31
+  data.tar.gz: 355cc6948f4513854032fde22251d7a4e136bd49
 SHA512:
-  metadata.gz: d35ee99456b3adad10251061b6576deaade4783f56239616283e308420dd45888a0ac5c16ea298b4499f52a7c8260cee7cdff6aa89032198f8a12c07bafcd881
-  data.tar.gz: d66c822297d2b63f7d0896c5943f1ca4e6c6d1d879f35824fd872c95ec3f5916ddbd30dc05500cb59209de82ef2fea4b534ef79001e81556f15ba178dd8ae558
+  metadata.gz: 1f225a898105d9363f624f1d62c3776d7d7893a2ad718fc1ebae4dacac84af2aad915566b2e4534ff4ab71c525faad95d425033f79f7b0f4c554529fca19fa8c
+  data.tar.gz: 34d5724a1fb8085e2677077abd08d70486f7195b0a1f019a53be8bd413de8c8b6e9cbcb3562a1e7943d1e31e23fea16f4dd6a0f0d6e9ef87d0dfcc5ecd8450d6

data/lib/parallel_tests/test/runner.rb

@@ -47,10 +47,10 @@ module ParallelTests
           when :filesize
             sort_by_filesize(tests)
           when :runtime
-            sort_by_runtime(tests, runtimes(options), options.merge(allowed_missing: 0.5))
+            sort_by_runtime(tests, runtimes(tests, options), options.merge(allowed_missing: 0.5))
           when nil
             # use recorded test runtime if we got enough data
-            runtimes = runtimes(options) rescue []
+            runtimes = runtimes(tests, options) rescue []
             if runtimes.size * 1.5 > tests.size
               puts "Using recorded test runtime"
               sort_by_runtime(tests, runtimes)
@@ -153,18 +153,10 @@ module ParallelTests
           allowed_missing = options[:allowed_missing] || 1.0
           allowed_missing = tests.size * allowed_missing
 
-          # build runtime hash
-          times = {}
-          runtimes.each do |line|
-            test, time = line.split(":", 2)
-            next unless test and time
-            times[test] = time.to_f
-          end
-
           # set know runtime for each test
           tests.sort!
           tests.map! do |test|
-            allowed_missing -= 1 unless time = times[test]
+            allowed_missing -= 1 unless time = runtimes[test]
             raise "Too little runtime info" if allowed_missing < 0
             [test, time]
           end
@@ -175,13 +167,18 @@ module ParallelTests
 
           # fill gaps with average runtime
           known, unknown = tests.partition(&:last)
-          average = known.map!(&:last).inject(:+) / known.size
+          average = (known.any? ? known.map!(&:last).inject(:+) / known.size : 1)
           unknown.each { |set| set[1] = average }
         end
 
-        def runtimes(options)
+        def runtimes(tests, options)
           log = options[:runtime_log] || runtime_log
-          File.read(log).split("\n")
+          lines = File.read(log).split("\n")
+          lines.each_with_object({}) do |line, times|
+            test, time = line.split(":", 2)
+            next unless test and time
+            times[test] = time.to_f if tests.include?(test)
+          end
         end
 
         def sort_by_filesize(tests)

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '1.3.5'
+  VERSION = Version = '1.3.6'
 end

metadata

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