Skip to content

Commit abbaf90

Browse files
committed
Update cmd files to remove HOMEBREW_TEST_GENERIC_OS variable
1 parent a772be9 commit abbaf90

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

Library/Homebrew/cmd/bundle.rb

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -376,18 +376,12 @@ def run
376376
file_opt = args_obj.respond_to?(:file) ? args_obj.file : nil
377377
no_upgrade_opt = args_obj.respond_to?(:no_upgrade?) ? args_obj.no_upgrade? : false
378378
verbose_opt = args_obj.respond_to?(:verbose?) ? args_obj.verbose? : false
379-
380-
if ENV["HOMEBREW_TEST_GENERIC_OS"] || (defined?(RSpec) && ENV.fetch("HOMEBREW_TEST_TMPDIR", nil))
381-
# Testing mode - output differently for the test compatibility
382-
puts "The Brewfile's dependencies are satisfied."
383-
else
384-
Homebrew::Bundle::Commands::Check.run(
385-
global: global_opt,
386-
file: file_opt,
387-
no_upgrade: no_upgrade_opt,
388-
verbose: verbose_opt,
389-
)
390-
end
379+
Homebrew::Bundle::Commands::Check.run(
380+
global: global_opt,
381+
file: file_opt,
382+
no_upgrade: no_upgrade_opt,
383+
verbose: verbose_opt,
384+
)
391385
end
392386
end
393387

Library/Homebrew/cmd/services.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ def run
112112

113113
sig { void }
114114
def default_subcommand
115-
# Skip in test mode to avoid errors
116-
return if ENV["HOMEBREW_TEST_GENERIC_OS"] || (defined?(RSpec) && ENV.fetch("HOMEBREW_TEST_TMPDIR", nil))
117-
118115
args_obj = T.unsafe(args)
119116
Homebrew::Services::Commands::List.run(json: args_obj.respond_to?(:json?) ? args_obj.json? : false)
120117
end
@@ -126,9 +123,6 @@ class ListSubcommand < AbstractSubcommand
126123

127124
sig { override.void }
128125
def run
129-
# Skip in test mode to avoid errors
130-
return if ENV["HOMEBREW_TEST_GENERIC_OS"] || (defined?(RSpec) && ENV.fetch("HOMEBREW_TEST_TMPDIR", nil))
131-
132126
args_obj = T.unsafe(args)
133127
Homebrew::Services::Commands::List.run(json: args_obj.respond_to?(:json?) ? args_obj.json? : false)
134128
end

0 commit comments

Comments
 (0)