diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2017-08-13 23:04:42 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-08-24 21:01:09 +0900 |
commit | 94f62a7de6ebdeb7c99e7e1b313872c03a84712a (patch) | |
tree | 7d581053e8ec7ee0856f42e393aef86fb2e8bd31 /test | |
parent | 134bff1bafd1d0a781a1ac0d4fcbebd963f9c241 (diff) | |
download | ruby-openssl-94f62a7de6ebdeb7c99e7e1b313872c03a84712a.tar.gz |
test/utils: remove OpenSSL::TestUtils.silent
Use EnvUtil.suppress_warning instead. We have started to use it already,
and the name 'suppress_warning' expresses what it does more clearly.
Diffstat (limited to 'test')
-rw-r--r-- | test/test_config.rb | 6 | ||||
-rw-r--r-- | test/test_ssl.rb | 4 | ||||
-rw-r--r-- | test/utils.rb | 9 |
3 files changed, 5 insertions, 14 deletions
diff --git a/test/test_config.rb b/test/test_config.rb index cc314335..99dcc497 100644 --- a/test/test_config.rb +++ b/test/test_config.rb @@ -173,7 +173,7 @@ __EOC__ def test_value # suppress deprecation warnings - OpenSSL::TestUtils.silent do + EnvUtil.suppress_warning do assert_equal('CA_default', @it.value('ca', 'default_ca')) assert_equal(nil, @it.value('ca', 'no such key')) assert_equal(nil, @it.value('no such section', 'no such key')) @@ -186,7 +186,7 @@ __EOC__ end def test_value_ENV - OpenSSL::TestUtils.silent do + EnvUtil.suppress_warning do key = ENV.keys.first assert_not_nil(key) # make sure we have at least one ENV var. assert_equal(ENV[key], @it.value('ENV', key)) @@ -201,7 +201,7 @@ __EOC__ end def test_section - OpenSSL::TestUtils.silent do + EnvUtil.suppress_warning do assert_equal({'HOME' => '.'}, @it.section('default')) assert_equal({'dir' => './demoCA', 'certs' => './certs'}, @it.section('CA_default')) assert_equal({}, @it.section('no_such_section')) diff --git a/test/test_ssl.rb b/test/test_ssl.rb index 31168b80..e3a10c34 100644 --- a/test/test_ssl.rb +++ b/test/test_ssl.rb @@ -187,7 +187,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase end def test_read_nonblock_without_session - OpenSSL::TestUtils.silent do + EnvUtil.suppress_warning do start_server(start_immediately: false) { |server, port| sock = TCPSocket.new("127.0.0.1", port) ssl = OpenSSL::SSL::SSLSocket.new(sock) @@ -332,7 +332,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx) ssl.sync_close = true begin - OpenSSL::TestUtils.silent do + EnvUtil.suppress_warning do # SSLError, not RuntimeError assert_raise(OpenSSL::SSL::SSLError) { ssl.connect } end diff --git a/test/utils.rb b/test/utils.rb index 6da02f69..a672b916 100644 --- a/test/utils.rb +++ b/test/utils.rb @@ -122,15 +122,6 @@ module OpenSSL::TestUtils pkvalue = publickey.value OpenSSL::Digest::SHA1.hexdigest(pkvalue).scan(/../).join(":").upcase end - - def silent - begin - back, $VERBOSE = $VERBOSE, nil - yield - ensure - $VERBOSE = back - end - end end class OpenSSL::TestCase < Test::Unit::TestCase |