From 86f113c9a67fb5d60d2b8847765f960abd94335f Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Sat, 29 Aug 2020 12:43:00 +0200
Subject: Import ruby/ruby@3beecafc2cae86290a191c1e841be13f5b08795d

---
 test/openssl/test_x509store.rb | 48 ++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/test/openssl/test_x509store.rb b/test/openssl/test_x509store.rb
index 7bbbc662..8fa52e5e 100644
--- a/test/openssl/test_x509store.rb
+++ b/test/openssl/test_x509store.rb
@@ -24,33 +24,35 @@ class OpenSSL::TestX509Store < OpenSSL::TestCase
     cert2 = issue_cert(cert2_subj, cert2_key, 1, ca_exts, nil, nil)
 
     # X509::Store#add_file reads concatenated PEM file
-    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)
-
-    # X509::Store#add_path
-    Dir.mktmpdir do |dir|
-      hash1 = "%08x.%d" % [cert1_subj.hash, 0]
-      File.write(File.join(dir, hash1), cert1.to_pem)
-      store = OpenSSL::X509::Store.new
-      store.add_path(dir)
+    Tempfile.open { |tmpfile|
+      tmpfile << cert1.to_pem << cert2.to_pem
+      tmpfile.close
 
-      assert_equal true, store.verify(cert1)
+      store = OpenSSL::X509::Store.new
+      assert_equal false, store.verify(cert1)
       assert_equal false, store.verify(cert2)
-    end
+      store.add_file(tmpfile.path)
+      assert_equal true, store.verify(cert1)
+      assert_equal true, store.verify(cert2)
+
+      # X509::Store#add_path
+      Dir.mktmpdir do |dir|
+        hash1 = "%08x.%d" % [cert1_subj.hash, 0]
+        File.write(File.join(dir, hash1), cert1.to_pem)
+        store = OpenSSL::X509::Store.new
+        store.add_path(dir)
 
-    # OpenSSL < 1.1.1 leaks an error on a duplicate certificate
-    assert_nothing_raised { store.add_file(tmpfile.path) }
-    assert_equal [], OpenSSL.errors
+        assert_equal true, store.verify(cert1)
+        assert_equal false, store.verify(cert2)
+      end
 
-    # Non-String is given
-    assert_raise(TypeError) { store.add_file(nil) }
-  ensure
-    tmpfile and tmpfile.close!
+      # OpenSSL < 1.1.1 leaks an error on a duplicate certificate
+      assert_nothing_raised { store.add_file(tmpfile.path) }
+      assert_equal [], OpenSSL.errors
+
+      # Non-String is given
+      assert_raise(TypeError) { store.add_file(nil) }
+    }
   end
 
   def test_verify_simple
-- 
cgit v1.2.3