diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/openssl/test_x509store.rb | 29 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 5 |
2 files changed, 18 insertions, 16 deletions
diff --git a/test/openssl/test_x509store.rb b/test/openssl/test_x509store.rb index e1898d62b9..1cbc73d539 100644 --- a/test/openssl/test_x509store.rb +++ b/test/openssl/test_x509store.rb @@ -33,21 +33,20 @@ class OpenSSL::TestX509Store < OpenSSL::TestCase ] cert1 = issue_cert(@ca1, @rsa1024, 1, ca_exts, nil, nil) cert2 = issue_cert(@ca2, @rsa2048, 1, ca_exts, nil, nil) - Tempfile.open { |tmpfile| - tmpfile << cert1.to_pem << cert2.to_pem - tmpfile.close - - store = OpenSSL::X509::Store.new - assert_equal false, store.verify(cert1) - assert_equal false, store.verify(cert2) - store.add_file(tmpfile.path) - assert_equal true, store.verify(cert1) - assert_equal true, store.verify(cert2) - - # OpenSSL < 1.1.1 leaks an error on a duplicate certificate - assert_nothing_raised { store.add_file(tmpfile.path) } - assert_equal [], OpenSSL.errors - } + tmpfile = Tempfile.open { |f| f << cert1.to_pem << cert2.to_pem; f } + + store = OpenSSL::X509::Store.new + assert_equal false, store.verify(cert1) + assert_equal false, store.verify(cert2) + store.add_file(tmpfile.path) + assert_equal true, store.verify(cert1) + assert_equal true, store.verify(cert2) + + # OpenSSL < 1.1.1 leaks an error on a duplicate certificate + assert_nothing_raised { store.add_file(tmpfile.path) } + assert_equal [], OpenSSL.errors + ensure + tmpfile and tmpfile.close! end def test_verify diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index c528eea0ae..fafb082154 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2814,7 +2814,7 @@ __END__ def test_flush_in_finalizer1 bug3910 = '[ruby-dev:42341]' - Tempfile.open("bug3910") {|t| + tmp = Tempfile.open("bug3910") {|t| path = t.path t.close fds = [] @@ -2826,6 +2826,7 @@ __END__ f.print "hoge" } end + t } ensure ObjectSpace.each_object(File) {|f| @@ -2833,6 +2834,7 @@ __END__ f.close end } + tmp.close! end def test_flush_in_finalizer2 @@ -2856,6 +2858,7 @@ __END__ end } end + t.close! } end |