diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-19 03:02:47 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-19 03:02:47 +0000 |
commit | 6b6368158dd2556007c036e4f01bf45fec2039f0 (patch) | |
tree | 66b3088557a9ed0c6e7b68760fbc77622d9b7ced /test/lib | |
parent | 9b5c2baae046fc943cd31279e325d59f13f54b3b (diff) |
merge revision(s) 56267,56268: [Backport #12943]
based on a patch provided by Aaron Patterson.
assertions.rb: success option
* test/lib/test/unit/assertions.rb (assert_in_out_err): add
success option to check the exit status.
* iseq.c (iseqw_s_compile_file): deal with syntax error as well as
compile, and should not abort when rescued.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/lib')
-rw-r--r-- | test/lib/test/unit/assertions.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb index 9a1cacd5a9..975d343ba4 100644 --- a/test/lib/test/unit/assertions.rb +++ b/test/lib/test/unit/assertions.rb @@ -539,7 +539,8 @@ EOT faildesc end - def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil, **opt) + def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil, + success: nil, **opt) stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt) if signo = status.termsig EnvUtil.diagnostic_reports(Signal.signame(signo), EnvUtil.rubybin, status.pid, Time.now) @@ -561,6 +562,15 @@ EOT end end end + unless success.nil? + a.for("success?") do + if success + assert_predicate(status, :success?) + else + assert_not_predicate(status, :success?) + end + end + end end status end |