From bae36f0830df37989b86ece36cc5282f32d7d087 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 8 Jun 2013 21:26:16 -0500 Subject: [PATCH] Make Test::Unit assertions available in formula tests Closes Homebrew/homebrew#18753. Closes Homebrew/homebrew#20358. --- Library/Homebrew/cmd/test.rb | 4 ++++ Library/Homebrew/formula.rb | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Library/Homebrew/cmd/test.rb b/Library/Homebrew/cmd/test.rb index 24644f41f9..ecc0874365 100644 --- a/Library/Homebrew/cmd/test.rb +++ b/Library/Homebrew/cmd/test.rb @@ -2,6 +2,7 @@ require 'extend/ENV' require 'hardware' require 'keg' require 'timeout' +require 'test/unit/assertions' module Homebrew extend self TEST_TIMEOUT_SECONDS = 5*60 @@ -31,6 +32,9 @@ module Homebrew extend self Timeout::timeout TEST_TIMEOUT_SECONDS do raise if f.test == false end + rescue Test::Unit::AssertionFailedError => e + ofail "#{f.name}: failed" + puts e.message rescue Exception ofail "#{f.name}: failed" end diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 06dfafa453..402c4500b6 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -562,6 +562,8 @@ class Formula end def test + require 'test/unit/assertions' + extend(Test::Unit::Assertions) ret = nil mktemp do @testpath = Pathname.pwd