summaryrefslogtreecommitdiff
path: root/test/lib/test/unit/assertions.rb
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-06-30 22:49:56 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-07-01 00:22:39 +0900
commitf13fb814e0343b5c09afe0c6d3114ee24b84d295 (patch)
tree95d15fc13ff08fc4509b1348d92cc57e0b12480d /test/lib/test/unit/assertions.rb
parent51b2b605e78a160790c6d751b2907b836b39561c (diff)
Return the result of the block given to assert_warning/assert_no_warning
Diffstat (limited to 'test/lib/test/unit/assertions.rb')
-rw-r--r--test/lib/test/unit/assertions.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb
index da2fc59425..169a3dcc7e 100644
--- a/test/lib/test/unit/assertions.rb
+++ b/test/lib/test/unit/assertions.rb
@@ -688,13 +688,15 @@ eom
end
def assert_warning(pat, msg = nil)
+ result = nil
stderr = EnvUtil.with_default_internal(pat.encoding) {
EnvUtil.verbose_warning {
- yield
+ result = yield
}
}
msg = message(msg) {diff pat, stderr}
assert(pat === stderr, msg)
+ result
end
def assert_warn(*args)
@@ -702,13 +704,15 @@ eom
end
def assert_no_warning(pat, msg = nil)
+ result = nil
stderr = EnvUtil.verbose_warning {
EnvUtil.with_default_internal(pat.encoding) {
- yield
+ result = yield
}
}
msg = message(msg) {diff pat, stderr}
refute(pat === stderr, msg)
+ result
end
def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: false, **opt)