From f13fb814e0343b5c09afe0c6d3114ee24b84d295 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 30 Jun 2019 22:49:56 +0900 Subject: Return the result of the block given to assert_warning/assert_no_warning --- test/lib/test/unit/assertions.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'test/lib/test/unit') 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) -- cgit v1.2.3