From d162aab9c686752ac55dd9202a7ece5c847c4943 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Thu, 15 Oct 2015 15:19:12 +0800 Subject: [PATCH] test-bot: ensure cleanup is running Closes Homebrew/homebrew#44982. Signed-off-by: Mike McQuaid --- Library/Homebrew/cmd/test-bot.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb index 0be845b623..663fdebefc 100644 --- a/Library/Homebrew/cmd/test-bot.rb +++ b/Library/Homebrew/cmd/test-bot.rb @@ -746,13 +746,16 @@ module Homebrew def run cleanup_before - download - setup - homebrew - formulae.each do |f| - formula(f) + begin + download + setup + homebrew + formulae.each do |f| + formula(f) + end + ensure + cleanup_after end - cleanup_after check_results end end @@ -1019,9 +1022,8 @@ module Homebrew file.write email_subject end end - + ensure HOMEBREW_CACHE.children.each(&:rmtree) if ARGV.include? "--clean-cache" - Homebrew.failed = any_errors end end