admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

fix tests

Browse Source
This commit is contained in:
Bevan Kay 2022-12-28 12:50:16 +11:00
parent 2614a29419
commit db9d48a7ec
No known key found for this signature in database
GPG Key ID: C55CB024B5314B57
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cask/artifact/abstract_uninstall.rb
View File

@ -101,7 +101,7 @@ module Cask
found_services = find_launchctl_with_wildcard(service)
next if found_services.blank?
found_services.each { |found_service| all_services += found_service }
found_services.each { |found_service| all_services << found_service }
end
all_services.each do |service|

36
Library/Homebrew/test/cask/artifact/shared_examples/uninstall_zap.rb
View File

@ -61,13 +61,39 @@ shared_examples "#uninstall_phase or #zap_phase" do
end
end
context "using launchctl with regex" do
context "using :launchctl with regex wildcard" do
let(:cask) { Cask::CaskLoader.load(cask_path("with-#{artifact_dsl_key}-launchctl-wildcard")) }
let(:launchctl_list_cmd) { %w[/bin/launchctl list] }
let(:launchctl_regex) { "my.fancy.package.service.*" }
let(:unknown_response) { "launchctl list returned unknown response\n" }
let(:service_info) do
<<~EOS
{
"LimitLoadToSessionType" = "Aqua";
"Label" = "my.fancy.package.service.12345";
"TimeOut" = 30;
"OnDemand" = true;
"LastExitStatus" = 0;
"ProgramArguments" = (
"argument";
);
};
EOS
end
it "searches running launchctl items" do
expect(fake_system_command).to receive(:run)
.with("/bin/launchctl", args: ["list"], print_stderr: false, sudo: false)
it "searches installed launchctl items" do
expect(subject).to receive(:find_launchctl_with_wildcard)
.with(launchctl_regex)
.and_return(["my.fancy.package.service.12345"])
allow(fake_system_command).to receive(:run)
.with("/bin/launchctl", args: ["list", "my.fancy.package.service.12345"], print_stderr: false, sudo: false)
.and_return(instance_double(SystemCommand::Result, stdout: unknown_response))
allow(fake_system_command).to receive(:run)
.with("/bin/launchctl", args: ["list", "my.fancy.package.service.12345"], print_stderr: false, sudo: true)
.and_return(instance_double(SystemCommand::Result, stdout: service_info))
expect(fake_system_command).to receive(:run!)
.with("/bin/launchctl", args: ["remove", "my.fancy.package.service.12345"], sudo: true)
.and_return(instance_double(SystemCommand::Result))
subject.public_send(:"#{artifact_dsl_key}_phase", command: fake_system_command)