remove unnecessary tap_args

It's now handled by Tap.fetch

1 files changed, 13 insertions, 4 deletions

diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 498b8444d..2c5ef7f7f 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -37,20 +37,29 @@ module Homebrew
 
   def resolve_test_tap
     tap = ARGV.value("tap")
-    return Tap.fetch(*tap_args(tap)) if tap
+    if tap
+      tap = Tap.fetch(tap)
+      return tap unless tap.core_formula_repository?
+    end
 
     if ENV["UPSTREAM_BOT_PARAMS"]
       bot_argv = ENV["UPSTREAM_BOT_PARAMS"].split " "
       bot_argv.extend HomebrewArgvExtension
       tap = bot_argv.value("tap")
-      return Tap.fetch(*tap_args(tap)) if tap
+      if tap
+        tap = Tap.fetch(tap)
+        return tap unless tap.core_formula_repository?
+      end
     end
 
     if git_url = ENV["UPSTREAM_GIT_URL"] || ENV["GIT_URL"]
       # Also can get tap from Jenkins GIT_URL.
       url_path = git_url.sub(%r{^https?://github\.com/}, "").chomp("/")
-      HOMEBREW_TAP_ARGS_REGEX =~ url_path
-      return Tap.fetch($1, $3) if $1 && $3 && $3 != "homebrew"
+      begin
+        tap = Tap.fetch(tap)
+        return tap unless tap.core_formula_repository?
+      rescue
+      end
     end
 
     # return nil means we are testing core repo.