From 36b0666f257ab0c48a6c0a4e2d67418fcf98c38c Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Sat, 13 Aug 2016 01:22:30 +0100 Subject: [PATCH] test_gpg: tweak rmtree usage Swats away this annoying warning when the test is skipped due to GPG being unavailable: ``` 1) Skipped: GpgTest#test_create_test_key: GPG Unavailable Error: GpgTest#test_create_test_key: NoMethodError: undefined method `rmtree' for nil:NilClass /usr/local/Library/Homebrew/test/test_gpg.rb:11:in `teardown' ``` Closes #675. Signed-off-by: Dominyk Tiller --- Library/Homebrew/test/test_gpg.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/test/test_gpg.rb b/Library/Homebrew/test/test_gpg.rb index 0d0f6b73a2..0374bdab4b 100644 --- a/Library/Homebrew/test/test_gpg.rb +++ b/Library/Homebrew/test/test_gpg.rb @@ -7,10 +7,6 @@ class GpgTest < Homebrew::TestCase @dir = Pathname.new(mktmpdir) end - def teardown - @dir.rmtree - end - def test_create_test_key Dir.chdir(@dir) do with_environment("HOME" => @dir) do @@ -18,5 +14,7 @@ class GpgTest < Homebrew::TestCase assert_predicate @dir/".gnupg/secring.gpg", :exist? end end + ensure + @dir.rmtree end end