diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 02:49:27 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 02:49:27 +0000 |
| commit | 1872f299e2aaa3c7fd74f59b12dcc63fadda272e (patch) | |
| tree | 9753550698c582f88df71b23794b21933eb1486a /test | |
| parent | 5483a6b8fe8c0c8fa0e270d47867928f314d9a19 (diff) | |
merge revision(s) 47362: [Backport #9984]
* test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak):
added timeout into testcase for low performance environment.
[Bug #9984][ruby-core:63367]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/openssl/test_pkey_rsa.rb | 4 | ||||
| -rw-r--r-- | test/ruby/envutil.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/openssl/test_pkey_rsa.rb b/test/openssl/test_pkey_rsa.rb index ce9bd60c2f..df0c6090cb 100644 --- a/test/openssl/test_pkey_rsa.rb +++ b/test/openssl/test_pkey_rsa.rb @@ -77,7 +77,7 @@ class OpenSSL::TestPKeyRSA < Test::Unit::TestCase def test_sign_verify_memory_leak bug9743 = '[ruby-core:62038] [Bug #9743]' - assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true) + assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true, timeout: 30) data = 'Sign me!' digest = OpenSSL::Digest::SHA512.new pkey = OpenSSL::PKey::RSA.new(2048) @@ -89,7 +89,7 @@ class OpenSSL::TestPKeyRSA < Test::Unit::TestCase } CODE - assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true) + assert_no_memory_leak(%w[-ropenssl], <<-PREP, <<-CODE, bug9743, rss: true, timeout: 30) data = 'Sign me!' digest = OpenSSL::Digest::SHA512.new pkey = OpenSSL::PKey::RSA.new(2048) diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index f27c15afb0..c330850e5c 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -340,7 +340,7 @@ eom assert_warning(*args) {$VERBOSE = false; yield} end - def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.52, rss: false) + def assert_no_memory_leak(args, prepare, code, message=nil, limit: 1.52, rss: false, timeout: 10) require_relative 'memory_status' token = "\e[7;1m#{$$.to_s}:#{Time.now.strftime('%s.%L')}:#{rand(0x10000).to_s(16)}:\e[m" token_dump = token.dump @@ -359,7 +359,7 @@ eom code, 'GC.start', ].join("\n") - _, err, status = EnvUtil.invoke_ruby(args, cmd, true, true) + _, err, status = EnvUtil.invoke_ruby(args, cmd, true, true, timeout: timeout) before = err.sub!(/^#{token_re}START=(\{.*\})\n/, '') && Memory::Status.parse($1) after = err.sub!(/^#{token_re}FINAL=(\{.*\})\n/, '') && Memory::Status.parse($1) assert_equal([true, ""], [status.success?, err], message) |