зеркало из https://github.com/github/ruby.git
Resolved conflict initializers
This commit is contained in:
Родитель
7ef0a4634c
Коммит
62db6e47b6
|
@ -42,6 +42,12 @@ module Test
|
|||
module Options # :nodoc: all
|
||||
def initialize(*, &block)
|
||||
@init_hook = block
|
||||
@report = []
|
||||
@errors = @failures = @skips = 0
|
||||
@verbose = false
|
||||
@mutex = Thread::Mutex.new
|
||||
@info_signal = Signal.list['INFO']
|
||||
@repeat_count = nil
|
||||
@options = nil
|
||||
super(&nil)
|
||||
end
|
||||
|
@ -1421,19 +1427,6 @@ module Test
|
|||
last_before_assertion.sub(/:in .*$/, '')
|
||||
end
|
||||
|
||||
##
|
||||
# Writes status for failed test +meth+ in +klass+ which finished with
|
||||
# exception +e+
|
||||
|
||||
def initialize # :nodoc:
|
||||
@report = []
|
||||
@errors = @failures = @skips = 0
|
||||
@verbose = false
|
||||
@mutex = Thread::Mutex.new
|
||||
@info_signal = Signal.list['INFO']
|
||||
@repeat_count = nil
|
||||
end
|
||||
|
||||
def synchronize # :nodoc:
|
||||
if @mutex then
|
||||
@mutex.synchronize { yield }
|
||||
|
|
Загрузка…
Ссылка в новой задаче