1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed minitest dependency bug by removing env PARALLEL checks (no clue why that was there). Exactly the same minitest code tho.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ryan 2013-05-10 00:55:03 +00:00
parent 2ffbe0345d
commit 8daa0d49cf
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/minitest/test_minitest_mock.rb
View File

@ -8,7 +8,7 @@
require 'minitest/autorun' require 'minitest/autorun'
class TestMiniTestMock < MiniTest::Unit::TestCase class TestMiniTestMock < MiniTest::Unit::TestCase
parallelize_me! if ENV["PARALLEL"] parallelize_me!
def setup def setup
@mock = MiniTest::Mock.new.expect(:foo, nil) @mock = MiniTest::Mock.new.expect(:foo, nil)
@ -278,7 +278,7 @@ end
require "minitest/metametameta" require "minitest/metametameta"
class TestMiniTestStub < MiniTest::Unit::TestCase class TestMiniTestStub < MiniTest::Unit::TestCase
parallelize_me! if ENV["PARALLEL"] parallelize_me!
def setup def setup
super super

2
test/minitest/test_minitest_spec.rb
View File

@ -598,7 +598,7 @@ class TestMetaStatic < MiniTest::Unit::TestCase
end end
class TestMeta < MiniTest::Unit::TestCase class TestMeta < MiniTest::Unit::TestCase
parallelize_me! if ENV["PARALLEL"] parallelize_me!
def util_structure def util_structure
x = y = z = nil x = y = z = nil

7
test/minitest/test_minitest_unit.rb
View File

@ -6,15 +6,14 @@
###################################################################### ######################################################################
require 'pathname' require 'pathname'
require_relative 'metametameta' require 'minitest/metametameta'
require 'minitest/parallel_each'
module MyModule; end module MyModule; end
class AnError < StandardError; include MyModule; end class AnError < StandardError; include MyModule; end
class ImmutableString < String; def inspect; super.freeze; end; end class ImmutableString < String; def inspect; super.freeze; end; end
class TestMiniTestUnit < MetaMetaMetaTestCase class TestMiniTestUnit < MetaMetaMetaTestCase
parallelize_me! if ENV["PARALLEL"] parallelize_me!
pwd = Pathname.new File.expand_path Dir.pwd pwd = Pathname.new File.expand_path Dir.pwd
basedir = Pathname.new(File.expand_path "lib/minitest") + 'mini' basedir = Pathname.new(File.expand_path "lib/minitest") + 'mini'
@ -1762,7 +1761,7 @@ class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
end end
class TestMiniTestGuard < MiniTest::Unit::TestCase class TestMiniTestGuard < MiniTest::Unit::TestCase
parallelize_me! if ENV["PARALLEL"] parallelize_me!
def test_mri_eh def test_mri_eh
assert self.class.mri? "ruby blah" assert self.class.mri? "ruby blah"