From 8c6cd23f2a83db1e9f310c8158add459a18b55ad Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@gmail.com>
Date: Sat, 26 Sep 2020 12:39:26 +0200
Subject: [PATCH] Revert "Import
 ruby/ruby@3beecafc2cae86290a191c1e841be13f5b08795d"

* This reverts commit 86f113c9a67fb5d60d2b8847765f960abd94335f.
* It was reverted in ruby/ruby.
---
 test/openssl/test_x509store.rb | 48 ++++++++++++++++------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/test/openssl/test_x509store.rb b/test/openssl/test_x509store.rb
index 8fa52e5ec..7bbbc6628 100644
--- a/test/openssl/test_x509store.rb
+++ b/test/openssl/test_x509store.rb
@@ -24,35 +24,33 @@ def test_add_file_path
     cert2 = issue_cert(cert2_subj, cert2_key, 1, ca_exts, nil, nil)
 
     # X509::Store#add_file reads concatenated PEM file
-    Tempfile.open { |tmpfile|
-      tmpfile << cert1.to_pem << cert2.to_pem
-      tmpfile.close
-
+    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
-      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)
+      store.add_path(dir)
 
-      # 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)
-
-        assert_equal true, store.verify(cert1)
-        assert_equal false, store.verify(cert2)
-      end
+      assert_equal true, store.verify(cert1)
+      assert_equal false, store.verify(cert2)
+    end
 
-      # OpenSSL < 1.1.1 leaks an error on a duplicate certificate
-      assert_nothing_raised { store.add_file(tmpfile.path) }
-      assert_equal [], OpenSSL.errors
+    # 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) }
-    }
+    # Non-String is given
+    assert_raise(TypeError) { store.add_file(nil) }
+  ensure
+    tmpfile and tmpfile.close!
   end
 
   def test_verify_simple