diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index bc42e3e795..71d7f95ddf 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -204,6 +204,7 @@ module Homebrew # with a short description of the software they come with. allow_list = [ "libfuse.2.dylib", # MacFuse + "libfuse3.*.dylib", # MacFuse "libfuse_ino64.2.dylib", # MacFuse "libmacfuse_i32.2.dylib", # OSXFuse MacFuse compatibility layer "libmacfuse_i64.2.dylib", # OSXFuse MacFuse compatibility layer @@ -261,6 +262,7 @@ module Homebrew # with a short description of the software they come with. allow_list = [ "fuse.pc", # OSXFuse/MacFuse + "fuse3.pc", # OSXFuse/MacFuse "macfuse.pc", # OSXFuse MacFuse compatibility layer "osxfuse.pc", # OSXFuse "libntfs-3g.pc", # NTFS-3G @@ -301,6 +303,7 @@ module Homebrew allow_list = [ "fuse.h", # MacFuse "fuse/**/*.h", # MacFuse + "fuse3/**/*.h", # MacFuse "macfuse/**/*.h", # OSXFuse MacFuse compatibility layer "osxfuse/**/*.h", # OSXFuse "ntfs/**/*.h", # NTFS-3G diff --git a/Library/Homebrew/test/bundle/whalebrew_installer_spec.rb b/Library/Homebrew/test/bundle/whalebrew_installer_spec.rb index 6ee6eb7341..a798abc673 100644 --- a/Library/Homebrew/test/bundle/whalebrew_installer_spec.rb +++ b/Library/Homebrew/test/bundle/whalebrew_installer_spec.rb @@ -10,6 +10,11 @@ RSpec.describe Homebrew::Bundle::WhalebrewInstaller do end describe ".installed_images" do + before do + described_class.reset! + Homebrew::Bundle::WhalebrewDumper.reset! + end + it "shells out" do expect { described_class.installed_images }.not_to raise_error end @@ -55,6 +60,7 @@ RSpec.describe Homebrew::Bundle::WhalebrewInstaller do context "when whalebrew is installed" do before do described_class.reset! + Homebrew::Bundle::WhalebrewDumper.reset! allow(Homebrew::Bundle).to receive(:whalebrew_installed?).and_return(true) allow(Homebrew::Bundle).to receive(:system).with("whalebrew", "install", "whalebrew/wget", verbose: false) .and_return(true)