Merge pull request #2794 from MikeMcQuaid/travis-ci-test-bot-tweaks

travis.yml: tweak how we handle homebrew/test-bot.

1 files changed, 7 insertions, 0 deletions

diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb
index 05e48da21..240e85b48 100644
--- a/Library/Homebrew/diagnostic.rb
+++ b/Library/Homebrew/diagnostic.rb
@@ -760,6 +760,8 @@ module Homebrew
               git -C "#{coretap_path}" remote add origin #{Formatter.url("https://github.com/Homebrew/homebrew-core.git")}
           EOS
         elsif origin !~ %r{Homebrew/homebrew-core(\.git|/)?$}
+          return if ENV["CI"] && origin.include?("Homebrew/homebrew-test-bot")
+
           <<-EOS.undent
             Suspicious #{CoreTap.instance} git origin remote found.
 
@@ -1027,6 +1029,11 @@ module Homebrew
         cmd_map.reject! { |_cmd_name, cmd_paths| cmd_paths.size == 1 }
         return if cmd_map.empty?
 
+        if ENV["CI"] && cmd_map.keys.length == 1 &&
+           cmd_map.keys.first == "brew-test-bot"
+          return
+        end
+
         message = "You have external commands with conflicting names.\n"
         cmd_map.each do |cmd_name, cmd_paths|
           message += inject_file_list cmd_paths, <<-EOS.undent