diff options
| author | Markus Reiter | 2017-01-26 00:26:04 +0100 |
|---|---|---|
| committer | Markus Reiter | 2017-02-03 17:27:36 +0100 |
| commit | f35c6c8cf1c79a01ff5176e14f17f92e40c8c69a (patch) | |
| tree | 404041dcb0d9f3e06448da5109d05f7609b44219 | |
| parent | e40c63f77c83254970c0e98f69ea76685536a905 (diff) | |
| download | brew-f35c6c8cf1c79a01ff5176e14f17f92e40c8c69a.tar.bz2 | |
Don’t use `before_setup` and `after_teardown`.
| -rw-r--r-- | Library/Homebrew/test/support/helper/fs_leak_logger.rb | 4 | ||||
| -rw-r--r-- | 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 774ccda04..3fbb148fa 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 fa7efd799..7d7ff52d9 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 |