From 8bfde013f631ec5026313c9194ec2fff8cfc5f01 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 22 Jan 2019 14:20:24 +0000
Subject: [PATCH] utils: fix SVN remote test on Mojave.

For some reason Mojave needs the SSL args always set otherwise this
will always fail waiting for interactivity.

Also, while debugging this I noticed that `utils.rb` had a failure
expecting an integer so fix that too.
---
 Library/Homebrew/utils.rb     | 2 +-
 Library/Homebrew/utils/svn.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index 98677b1976..9f68554e7f 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -291,7 +291,7 @@ module Homebrew
 
     $times = {}
     at_exit do
-      col_width = [$times.keys.map(&:size).max + 2, 15].max
+      col_width = [$times.keys.map(&:size).max.to_i + 2, 15].max
       $times.sort_by { |_k, v| v }.each do |method, time|
         puts format("%-*s %0.4f sec", col_width, "#{method}:", time)
       end
diff --git a/Library/Homebrew/utils/svn.rb b/Library/Homebrew/utils/svn.rb
index b824e0d064..23c9fe13d4 100644
--- a/Library/Homebrew/utils/svn.rb
+++ b/Library/Homebrew/utils/svn.rb
@@ -12,7 +12,9 @@ module Utils
   def self.svn_remote_exists?(url)
     return true unless svn_available?
 
-    ssl_args = ["--non-interactive", "--trust-server-cert"] if ENV["HOMEBREW_TEST_ONLINE"]
-    quiet_system "svn", "ls", url, "--depth", "empty", *ssl_args
+    # OK to unconditionally trust here because we're just checking if
+    # a URL exists.
+    quiet_system "svn", "ls", url, "--depth", "empty",
+                 "--non-interactive", "--trust-server-cert"
   end
 end