From 924af100b73d24dffb2199fa46ae118e8b3bbb29 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 6 Nov 2019 14:28:05 +0000
Subject: [PATCH 1/2] cask/pkg_spec: remove flaky test.

---
 Library/Homebrew/test/cask/pkg_spec.rb | 28 --------------------------
 1 file changed, 28 deletions(-)

diff --git a/Library/Homebrew/test/cask/pkg_spec.rb b/Library/Homebrew/test/cask/pkg_spec.rb
index 486ab8f822..fdcfe65fb6 100644
--- a/Library/Homebrew/test/cask/pkg_spec.rb
+++ b/Library/Homebrew/test/cask/pkg_spec.rb
@@ -6,34 +6,6 @@ describe Cask::Pkg, :cask do
     let(:empty_response) { double(stdout: "", plist: { "volume" => "/", "install-location" => "", "paths" => {} }) }
     let(:pkg) { described_class.new("my.fake.pkg", fake_system_command) }
 
-    it "removes files and dirs referenced by the pkg" do
-      some_files = Array.new(3) { Pathname.new(Tempfile.new("plain_file").path) }
-      allow(pkg).to receive(:pkgutil_bom_files).and_return(some_files)
-
-      some_specials = Array.new(3) { Pathname.new(Tempfile.new("special_file").path) }
-      allow(pkg).to receive(:pkgutil_bom_specials).and_return(some_specials)
-
-      some_dirs = Array.new(3) { mktmpdir }
-      allow(pkg).to receive(:pkgutil_bom_dirs).and_return(some_dirs)
-
-      root_dir = Pathname.new(mktmpdir)
-      allow(pkg).to receive(:root).and_return(root_dir)
-
-      allow(pkg).to receive(:forget)
-
-      pkg.uninstall
-
-      some_files.each do |file|
-        expect(file).not_to exist
-      end
-
-      some_dirs.each do |dir|
-        expect(dir).not_to exist
-      end
-
-      expect(root_dir).not_to exist
-    end
-
     context "pkgutil" do
       it "forgets the pkg" do
         allow(fake_system_command).to receive(:run!).with(

From 6a3395988831a4fab8a187c292738af2e82b5d2c Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 6 Nov 2019 14:58:33 +0000
Subject: [PATCH 2/2] test/subversion: fix subversion paths/detection.

---
 Library/Homebrew/test/spec_helper.rb              | 15 +++++++++++++--
 .../test/unpack_strategy/subversion_spec.rb       |  4 +---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
index d997067eed..1d51d2f96e 100644
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@@ -124,8 +124,19 @@ RSpec.configure do |config|
   end
 
   config.before(:each, :needs_svn) do
-    homebrew_bin = File.dirname HOMEBREW_BREW_FILE
-    skip "subversion not installed." unless %W[/usr/bin/svn #{homebrew_bin}/svn].map { |x| File.executable?(x) }.any?
+    svn_paths = PATH.new(ENV["PATH"])
+    if OS.mac?
+      xcrun_svn = Utils.popen_read("xcrun", "-f", "svn")
+      svn_paths.append(File.dirname(xcrun_svn)) if $CHILD_STATUS.success? && xcrun_svn.present?
+    end
+
+    svn = which("svn", svn_paths)
+    svnadmin = which("svnadmin", svn_paths)
+    skip "subversion not installed." if !svn || !svnadmin
+
+    ENV["PATH"] = PATH.new(ENV["PATH"])
+                      .append(svn.dirname)
+                      .append(svnadmin.dirname)
   end
 
   config.before(:each, :needs_unzip) do
diff --git a/Library/Homebrew/test/unpack_strategy/subversion_spec.rb b/Library/Homebrew/test/unpack_strategy/subversion_spec.rb
index 81d958d600..78795f94cc 100644
--- a/Library/Homebrew/test/unpack_strategy/subversion_spec.rb
+++ b/Library/Homebrew/test/unpack_strategy/subversion_spec.rb
@@ -8,9 +8,7 @@ describe UnpackStrategy::Subversion, :needs_svn do
   let(:path) { working_copy }
 
   before do
-    svnadmin = ["svnadmin"]
-    svnadmin = ["xcrun", *svnadmin] if OS.mac? && MacOS.version >= :catalina
-    safe_system(*svnadmin, "create", repo)
+    safe_system "svnadmin", "create", repo
     safe_system "svn", "checkout", "file://#{repo}", working_copy
 
     FileUtils.touch working_copy/"test"