admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Don’t use before_setup and after_teardown.

Browse Source
This commit is contained in:
Markus Reiter 2017-01-26 00:26:04 +01:00
parent e40c63f77c
commit f35c6c8cf1
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/test/support/helper/fs_leak_logger.rb
View File

@ -9,13 +9,13 @@ module Test
klass.make_my_diffs_pretty! klass.make_my_diffs_pretty!
end end
def before_setup def setup
@__files_before_test = [] @__files_before_test = []
Find.find(TEST_TMPDIR) { |f| @__files_before_test << f.sub(TEST_TMPDIR, "") } Find.find(TEST_TMPDIR) { |f| @__files_before_test << f.sub(TEST_TMPDIR, "") }
super super
end end
def after_teardown def teardown
super super
files_after_test = [] files_after_test = []
Find.find(TEST_TMPDIR) { |f| files_after_test << f.sub(TEST_TMPDIR, "") } Find.find(TEST_TMPDIR) { |f| files_after_test << f.sub(TEST_TMPDIR, "") }

10
Library/Homebrew/test/support/helper/test_case.rb
View File

@ -12,7 +12,7 @@ module Homebrew
TEST_SHA1 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze TEST_SHA1 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze
TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze TEST_SHA256 = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef".freeze
def before_setup def setup
[ [
HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-core/Formula", HOMEBREW_LIBRARY/"Taps/homebrew/homebrew-core/Formula",
HOMEBREW_CACHE, HOMEBREW_CACHE,
@ -24,10 +24,6 @@ module Homebrew
].each(&:mkpath) ].each(&:mkpath)
super super
end
def setup
super
@__argv = ARGV.dup @__argv = ARGV.dup
@__env = ENV.to_hash # dup doesn't work on ENV @__env = ENV.to_hash # dup doesn't work on ENV
@ -37,10 +33,6 @@ module Homebrew
ARGV.replace(@__argv) ARGV.replace(@__argv)
ENV.replace(@__env) ENV.replace(@__env)
super
end
def after_teardown
Tab.clear_cache Tab.clear_cache
coretap = CoreTap.new coretap = CoreTap.new