Merge pull request #3247 from reitermarkus/fix-trash

Fix `brew tests` leaving last file in trash.

2 files changed, 7 insertions, 2 deletions

diff --git a/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb b/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb
index badd549ce..d0b2eb6ef 100644
--- a/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb
+++ b/Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb
@@ -253,7 +253,7 @@ module Hbc
       end
 
       def trash_paths(*paths, command: nil, **_)
-        command.run!("/usr/bin/osascript", args: ["-e", <<-'EOS'.undent, *paths])
+        result = command.run!("/usr/bin/osascript", args: ["-e", <<-'EOS'.undent, *paths])
           on run argv
             repeat with i from 1 to (count argv)
               set item i of argv to (item i of argv as POSIX file)
@@ -267,7 +267,7 @@ module Hbc
                 set trashedItem to POSIX path of (item i of trashedItems as string)
                 set output to output & trashedItem
                 if i < count trashedItems then
-                  set output to output & (do shell script "printf \"\\0\"")
+                  set output to output & character id 0
                 end if
               end repeat
 
@@ -275,6 +275,9 @@ module Hbc
             end tell
           end run
         EOS
+
+        # Remove AppleScript's automatic newline.
+        result.tap { |r| r.stdout.sub!(/\n$/, "") }
       end
 
       def uninstall_rmdir(*directories, command: nil, **_)
diff --git a/Library/Homebrew/test/cask/artifact/uninstall_zap_shared_examples.rb b/Library/Homebrew/test/cask/artifact/uninstall_zap_shared_examples.rb
index 06eec4a01..4fdab60d0 100644
--- a/Library/Homebrew/test/cask/artifact/uninstall_zap_shared_examples.rb
+++ b/Library/Homebrew/test/cask/artifact/uninstall_zap_shared_examples.rb
@@ -149,6 +149,8 @@ shared_examples "#uninstall_phase or #zap_phase" do
   end
 
   [:delete, :trash].each do |directive|
+    next if directive == :trash && ENV["HOMEBREW_TESTS_COVERAGE"].nil?
+
     context "using :#{directive}" do
       let(:dir) { TEST_TMPDIR }
       let(:absolute_path) { Pathname.new("#{dir}/absolute_path") }