From f35c6c8cf1c79a01ff5176e14f17f92e40c8c69a Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Thu, 26 Jan 2017 00:26:04 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20use=20`before=5Fsetup`=20and=20?=
 =?UTF-8?q?`after=5Fteardown`.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Library/Homebrew/test/support/helper/fs_leak_logger.rb |  4 ++--
 Library/Homebrew/test/support/helper/test_case.rb      | 10 +---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Library/Homebrew/test/support/helper/fs_leak_logger.rb b/Library/Homebrew/test/support/helper/fs_leak_logger.rb
index 774ccda04d..3fbb148fa6 100644
--- a/Library/Homebrew/test/support/helper/fs_leak_logger.rb
+++ b/Library/Homebrew/test/support/helper/fs_leak_logger.rb
@@ -9,13 +9,13 @@ module Test
         klass.make_my_diffs_pretty!
       end
 
-      def before_setup
+      def setup
         @__files_before_test = []
         Find.find(TEST_TMPDIR) { |f| @__files_before_test << f.sub(TEST_TMPDIR, "") }
         super
       end
 
-      def after_teardown
+      def teardown
         super
         files_after_test = []
         Find.find(TEST_TMPDIR) { |f| files_after_test << f.sub(TEST_TMPDIR, "") }
diff --git a/Library/Homebrew/test/support/helper/test_case.rb b/Library/Homebrew/test/support/helper/test_case.rb
index fa7efd7993..7d7ff52d9c 100644
--- a/Library/Homebrew/test/support/helper/test_case.rb
+++ b/Library/Homebrew/test/support/helper/test_case.rb
@@ -12,7 +12,7 @@ module Homebrew
     TEST_SHA1   = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze
     TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze
 
-    def before_setup
+    def setup
       [
         HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-core/Formula",
         HOMEBREW_CACHE,
@@ -24,10 +24,6 @@ module Homebrew
       ].each(&:mkpath)
 
       super
-    end
-
-    def setup
-      super
 
       @__argv = ARGV.dup
       @__env = ENV.to_hash # dup doesn't work on ENV
@@ -37,10 +33,6 @@ module Homebrew
       ARGV.replace(@__argv)
       ENV.replace(@__env)
 
-      super
-    end
-
-    def after_teardown
       Tab.clear_cache
 
       coretap = CoreTap.new