minitest-parallel_fork 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09d52a418fc9f248ded3902c4b7a5fd4b775cdfa
-  data.tar.gz: 36a3dcb18d5b7652af47c934c8a8a082a8ea78bc
+  metadata.gz: eba31fcb9f0832fd81e818423d5f628ea679bd2f
+  data.tar.gz: bf91180a0b69834f62519d1ada73fd1ce790fa98
 SHA512:
-  metadata.gz: ccc49c0c045f2c9f8d3c6003373306fa75c787bee8b95eec0c401e9e9c5353f91635f52fce24714b7d2ffb7ab7f7e849abcb7dedaae0c3210009dbcb7e00b8f8
-  data.tar.gz: dd22675a8b0cbe257640b8c2ff518f30990b827ba8c02b1d33b89c49fa84d28fca37e5a9ba7e26fcdd7cdef87fb26d525ae1196dd373069cb0e944297ca0a9e9
+  metadata.gz: 364efbc3cff8e3e9b609b1fb8685c19866b8ce074f542edc1ef6c6cd78dd8be91aa14aba5d7bd4ba89ac612519f87e99930df776e0bdbf529a523c75fb3545b1
+  data.tar.gz: 76cd985717baf5d01b7ef92a3c3e0800dc6c186be4e61f757d4f15d4bf1e82a11acd72740cfc5fde302d4749ada3aa67eee9cd5da9698ff9601952cb7ff40451

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 1.0.1 (2017-01-05)
+
+* Work with test suites that use parallelize_me! (jeremyevans) (#1)
+
 === 1.0.0 (2015-05-11)
 
 * Initial Public Release

data/lib/minitest/parallel_fork.rb

@@ -36,6 +36,10 @@ module Minitest
     end
   end
 
+  module Unparallelize
+    define_method(:run_one_method, &Minitest::Test.method(:run_one_method))
+  end
+
   # Override __run to use a child forks to run the speeds, which
   # allows for parallel spec execution on MRI.
   def self.__run(reporter, options)
@@ -58,8 +62,13 @@ module Minitest
 
         p_suites = []
         suites.each_with_index{|s, j| p_suites << s if j % n == i}
-        p_suites.partition{|s| s.test_order != :parallel}.
-          map{|ss| ss.map{|s| s.run(reporter, options) }}
+        p_suites.each do |s|
+          if s.is_a?(Minitest::Parallel::Test::ClassMethods)
+           s.extend(Unparallelize)
+          end
+
+          s.run(reporter, options)
+        end
 
         data = %w'count assertions results'.map{|meth| stat_reporter.send(meth)}
         data[-1] = data[-1].map do |res|

data/spec/minitest_parallel_fork_example.rb

@@ -1,3 +1,4 @@
+gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/parallel_fork'
 
@@ -13,6 +14,14 @@ end
 
 4.times do |i|
   describe 'minitest/parallel_fork' do
+    parallelize_me! if ENV['MPF_PARALLELIZE_ME']
+
+    if ENV['MPF_TEST_ORDER_PARALLEL']
+      def self.test_order
+        :parallel
+      end
+    end
+
     it "should work" do
       sleep(1).must_equal 1
     end

data/spec/minitest_parallel_fork_spec.rb

@@ -1,14 +1,25 @@
+gem 'minitest'
 require 'minitest/autorun'
 
 describe 'minitest/parallel_fork' do
-  it "should work" do
-    t = Time.now
-    ENV['NCPU'] = '4'
-    output = `#{ENV['RUBY']} -I lib spec/minitest_parallel_fork_example.rb`
-    (Time.now - t).must_be :<, 4
-    output.must_match /:parent/
-    4.times do |i|
-      output.must_match /:child#{i}a/
+  [[nil, ''],
+   ['MPF_PARALLELIZE_ME', ' when parallelize_me! is used'],
+   ['MPF_TEST_ORDER_PARALLEL', ' when test_order parallel is used']
+  ].each do |env_key, msg|
+    it "should execute in parallel#{msg}" do
+      t = Time.now
+      ENV['NCPU'] = '4'
+      ENV[env_key] = '1' if env_key
+      output = `#{ENV['RUBY']} -I lib spec/minitest_parallel_fork_example.rb`
+      ENV.delete(env_key) if env_key
+
+      time = (Time.now - t)
+      time.must_be :<, 4
+      time.must_be :>, 1
+      output.must_match /:parent/
+      4.times do |i|
+        output.must_match /:child#{i}a/
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-parallel_fork
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -73,8 +73,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Fork-based parallelization for minitest'
+summary: Fork-based parallelization for minitest
 test_files: []