From 8daa0d49cfa4c20f778a6f07f8f242f443c66b31 Mon Sep 17 00:00:00 2001
From: ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 10 May 2013 00:55:03 +0000
Subject: Fixed minitest dependency bug by removing env PARALLEL checks (no
 clue why that was there). Exactly the same minitest code tho.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/minitest/test_minitest_mock.rb | 4 ++--
 test/minitest/test_minitest_spec.rb | 2 +-
 test/minitest/test_minitest_unit.rb | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'test/minitest')

diff --git a/test/minitest/test_minitest_mock.rb b/test/minitest/test_minitest_mock.rb
index 7fabb79292..8c005e8be8 100644
--- a/test/minitest/test_minitest_mock.rb
+++ b/test/minitest/test_minitest_mock.rb
@@ -8,7 +8,7 @@
 require 'minitest/autorun'
 
 class TestMiniTestMock < MiniTest::Unit::TestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   def setup
     @mock = MiniTest::Mock.new.expect(:foo, nil)
@@ -278,7 +278,7 @@ end
 require "minitest/metametameta"
 
 class TestMiniTestStub < MiniTest::Unit::TestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   def setup
     super
diff --git a/test/minitest/test_minitest_spec.rb b/test/minitest/test_minitest_spec.rb
index 96589ede0b..e39d96d50a 100644
--- a/test/minitest/test_minitest_spec.rb
+++ b/test/minitest/test_minitest_spec.rb
@@ -598,7 +598,7 @@ class TestMetaStatic < MiniTest::Unit::TestCase
 end
 
 class TestMeta < MiniTest::Unit::TestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   def util_structure
     x = y = z = nil
diff --git a/test/minitest/test_minitest_unit.rb b/test/minitest/test_minitest_unit.rb
index 6a2e4f5190..0f29614e87 100644
--- a/test/minitest/test_minitest_unit.rb
+++ b/test/minitest/test_minitest_unit.rb
@@ -6,15 +6,14 @@
 ######################################################################
 
 require 'pathname'
-require_relative 'metametameta'
-require 'minitest/parallel_each'
+require 'minitest/metametameta'
 
 module MyModule; end
 class AnError < StandardError; include MyModule; end
 class ImmutableString < String; def inspect; super.freeze; end; end
 
 class TestMiniTestUnit < MetaMetaMetaTestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   pwd = Pathname.new File.expand_path Dir.pwd
   basedir = Pathname.new(File.expand_path "lib/minitest") + 'mini'
@@ -1762,7 +1761,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
 end
 
 class TestMiniTestGuard < MiniTest::Unit::TestCase
-  parallelize_me! if ENV["PARALLEL"]
+  parallelize_me!
 
   def test_mri_eh
     assert self.class.mri? "ruby blah"
-- 
cgit v1.2.3