summaryrefslogtreecommitdiff
path: root/test/minitest/test_minitest_unit.rb
diff options
context:
space:
mode:
authorryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-10 00:55:03 +0000
committerryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-05-10 00:55:03 +0000
commit8daa0d49cfa4c20f778a6f07f8f242f443c66b31 (patch)
tree3dfe9c03f16d58722f21d7e29c45526f41dfeab6 /test/minitest/test_minitest_unit.rb
parent2ffbe0345dd606cffcc30cbfce437762f5fcb496 (diff)
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
Diffstat (limited to 'test/minitest/test_minitest_unit.rb')
-rw-r--r--test/minitest/test_minitest_unit.rb7
1 files changed, 3 insertions, 4 deletions
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"