From d5325eb4e4eec11ad31b61c641472a5fb5142ac8 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Fri, 9 Aug 2013 11:29:19 -0500
Subject: Always prune empty toplevel directories when unlinking

Closes Homebrew/homebrew#21750.
---
 Library/Homebrew/test/test_keg.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Library/Homebrew/test')

diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb
index de6ffa0d8..d9cce89fa 100644
--- a/Library/Homebrew/test/test_keg.rb
+++ b/Library/Homebrew/test/test_keg.rb
@@ -85,17 +85,17 @@ class LinkTests < Test::Unit::TestCase
     assert_equal "#{HOMEBREW_PREFIX}/bin/helloworld\n", $stdout.string
   end
 
-  def test_unlink_prunes_empty_toplevel_directories_fails
+  def test_unlink_prunes_empty_toplevel_directories
     mkpath HOMEBREW_PREFIX/"lib/foo/bar"
     mkpath @keg/"lib/foo/bar"
     touch @keg/"lib/foo/bar/file1"
 
     @keg.unlink
 
-    assert File.directory?(HOMEBREW_PREFIX/"lib/foo")
+    assert !File.directory?(HOMEBREW_PREFIX/"lib/foo")
   end
 
-  def test_unlink_ignores_DS_Store_when_pruning_empty_dirs_fails
+  def test_unlink_ignores_DS_Store_when_pruning_empty_dirs
     mkpath HOMEBREW_PREFIX/"lib/foo/bar"
     touch HOMEBREW_PREFIX/"lib/foo/.DS_Store"
     mkpath @keg/"lib/foo/bar"
@@ -103,8 +103,8 @@ class LinkTests < Test::Unit::TestCase
 
     @keg.unlink
 
-    assert File.directory?(HOMEBREW_PREFIX/"lib/foo")
-    assert File.exist?(HOMEBREW_PREFIX/"lib/foo/.DS_Store")
+    assert !File.directory?(HOMEBREW_PREFIX/"lib/foo")
+    assert !File.exist?(HOMEBREW_PREFIX/"lib/foo/.DS_Store")
   end
 
   def teardown
-- 
cgit v1.2.3