test-bot: separate tap/core no formula handling.

`e.tap` calls the tap method which wants a block on
`FormulaUnavailableError` so the previous approach is :-1:.

1 files changed, 9 insertions, 4 deletions

diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index dc176f52e..a3bd2d4a5 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -247,10 +247,15 @@ module Homebrew
 
     def safe_formula_canonical_name(formula_name)
       Formulary.factory(formula_name).full_name
-    rescue TapFormulaUnavailableError, FormulaUnavailableError => e
-      exception_tap = e.tap || CoreTap.instance
-      raise if exception_tap.installed?
-      test "brew", "tap", exception_tap.name
+    rescue TapFormulaUnavailableError => e
+      raise if e.tap.installed?
+      test "brew", "tap", e.tap.name
+      retry unless steps.last.failed?
+      onoe e
+      puts e.backtrace
+    rescue FormulaUnavailableError => e
+      raise if CoreTap.instance.installed?
+      test "brew", "tap", CoreTap.instance.name
       retry unless steps.last.failed?
       onoe e
       puts e.backtrace