From 26b80ecccca8db33fb067158634ac54630fec2d0 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Thu, 8 Jan 2015 20:49:24 +0000
Subject: test-bot: improve output of dependent testing.

---
 Library/Homebrew/cmd/test-bot.rb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index d232e30ff..8d49f7df8 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -365,9 +365,6 @@ module Homebrew
       dependents -= @formulae
       dependents = dependents.map {|d| Formulary.factory(d)}
       testable_dependents = dependents.select {|d| d.test_defined? && d.stable.bottled? }
-      uninstalled_testable_dependents = testable_dependents.reject {|d| d.installed? }
-      testable_dependents.map! &:name
-      uninstalled_testable_dependents.map! &:name
 
       formula = Formulary.factory(formula_name)
       return unless satisfied_requirements?(formula, :stable)
@@ -446,12 +443,16 @@ module Homebrew
           end
         end
         test "brew", "test", "--verbose", formula_name if formula.test_defined?
-        if testable_dependents.any?
-          if uninstalled_testable_dependents.any?
-            test "brew", "fetch", *uninstalled_testable_dependents
-            test "brew", "install", *uninstalled_testable_dependents
+        testable_dependents.each do |dependent|
+          unless dependent.installed?
+            test "brew", "fetch", "--retry", dependent.name
+            next if steps.last.failed?
+            test "brew", "install", dependent.name
+            next if steps.last.failed?
+          end
+          if dependent.installed?
+            test "brew", "test", "--verbose", dependent.name
           end
-          test "brew", "test", *testable_dependents
         end
         test "brew", "uninstall", "--force", formula_name
       end
-- 
cgit v1.2.3