admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Rescue Minitest::Assertion under Ruby 2.0

Browse Source
This commit is contained in:
Jack Nagel 2014-06-04 15:38:33 -05:00
parent 62e79c8d09
commit d0be32f60b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/test.rb
View File

@ -7,6 +7,12 @@ require 'test/unit/assertions'
module Homebrew extend self module Homebrew extend self
TEST_TIMEOUT_SECONDS = 5*60 TEST_TIMEOUT_SECONDS = 5*60
if Object.const_defined?(:Minitest)
FailedAssertion = Minitest::Assertion
else
FailedAssertion = Test::Unit::AssertionFailedError
end
def test def test
raise FormulaUnspecifiedError if ARGV.named.empty? raise FormulaUnspecifiedError if ARGV.named.empty?
@ -32,7 +38,7 @@ module Homebrew extend self
Timeout::timeout TEST_TIMEOUT_SECONDS do Timeout::timeout TEST_TIMEOUT_SECONDS do
raise if f.test == false raise if f.test == false
end end
rescue Test::Unit::AssertionFailedError => e rescue FailedAssertion => e
ofail "#{f.name}: failed" ofail "#{f.name}: failed"
puts e.message puts e.message
rescue Exception rescue Exception