From 1b1bf56733e1ede7d414c8a5ef1e04dabc645455 Mon Sep 17 00:00:00 2001
From: Martin Afanasjew <martin@afanasjew.de>
Date: Tue, 5 Jul 2016 14:36:02 +0200
Subject: [PATCH] tests: fix leak in '[un]linkapps' integration test (#439)
Prior to the fix, every run of the test suite would leave behind a pair
of empty directories in `$TMPDIR`. (A temporary home directory was
created but only its child `Applications` was wiped when done.)
---
Library/Homebrew/test/test_integration_cmds.rb | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/Library/Homebrew/test/test_integration_cmds.rb b/Library/Homebrew/test/test_integration_cmds.rb
index c91dfc5472..ca1d29a1ea 100644
--- a/Library/Homebrew/test/test_integration_cmds.rb
+++ b/Library/Homebrew/test/test_integration_cmds.rb
@@ -424,24 +424,23 @@ class IntegrationCommandTests < Homebrew::TestCase
end
def test_linkapps
- home = mktmpdir
- apps_dir = Pathname.new(home).join("Applications")
- apps_dir.mkpath
+ home_dir = Pathname.new(mktmpdir)
+ (home_dir/"Applications").mkpath
setup_test_formula "testball"
source_dir = HOMEBREW_CELLAR/"testball/0.1/TestBall.app"
source_dir.mkpath
assert_match "Linking: #{source_dir}",
- cmd("linkapps", "--local", "HOME" => home)
+ cmd("linkapps", "--local", "HOME" => home_dir)
ensure
- FileUtils.rm_rf apps_dir
+ home_dir.rmtree
(HOMEBREW_CELLAR/"testball").rmtree
end
def test_unlinkapps
- home = mktmpdir
- apps_dir = Pathname.new(home).join("Applications")
+ home_dir = Pathname.new(mktmpdir)
+ apps_dir = home_dir/"Applications"
apps_dir.mkpath
setup_test_formula "testball"
@@ -452,9 +451,9 @@ class IntegrationCommandTests < Homebrew::TestCase
FileUtils.ln_s source_app, "#{apps_dir}/TestBall.app"
assert_match "Unlinking: #{apps_dir}/TestBall.app",
- cmd("unlinkapps", "--local", "HOME" => home)
+ cmd("unlinkapps", "--local", "HOME" => home_dir)
ensure
- apps_dir.rmtree
+ home_dir.rmtree
(HOMEBREW_CELLAR/"testball").rmtree
end
--
GitLab