summaryrefslogtreecommitdiff
path: root/test/openssl/test_engine.rb
diff options
context:
space:
mode:
authorrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-12 04:48:10 +0000
committerrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-12 04:48:10 +0000
commitaefb79c24ff44f25c3f7a7a48c05ee9a75a95920 (patch)
tree6d747ac86d6f2f611051e3838a0a0c0d6b8b51c4 /test/openssl/test_engine.rb
parent7a4aea47e281402a178b69b5f90d6ed330122e67 (diff)
openssl: avoid test failure in test_engine.rb
* test/openssl/test_engine.rb (test_openssl_engine_builtin, test_openssl_engine_by_id_string): Skip test if 'openssl' engine is already loaded. And test the number increased by Engine.load{_by_id,}, not the total count of loaded engines. Previously, we called OpenSSL::Engine.cleanup every time running a test case, but we no longer can do it. [ruby-core:75225] [Feature #12324] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl/test_engine.rb')
-rw-r--r--test/openssl/test_engine.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/openssl/test_engine.rb b/test/openssl/test_engine.rb
index 77f6e1a967..bbf56a1887 100644
--- a/test/openssl/test_engine.rb
+++ b/test/openssl/test_engine.rb
@@ -13,17 +13,21 @@ class OpenSSL::TestEngine < OpenSSL::TestCase
def test_openssl_engine_builtin
with_openssl <<-'end;'
+ orig = OpenSSL::Engine.engines
+ skip "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" }
engine = OpenSSL::Engine.load("openssl")
assert_equal(true, engine)
- assert_equal(1, OpenSSL::Engine.engines.size)
+ assert_equal(1, OpenSSL::Engine.engines.size - orig.size)
end;
end
def test_openssl_engine_by_id_string
with_openssl <<-'end;'
+ orig = OpenSSL::Engine.engines
+ skip "'openssl' is already loaded" if orig.any? { |e| e.id == "openssl" }
engine = get_engine
assert_not_nil(engine)
- assert_equal(1, OpenSSL::Engine.engines.size)
+ assert_equal(1, OpenSSL::Engine.engines.size - orig.size)
end;
end