ruby-changes:24843
From: emboss <ko1@a...>
Date: Tue, 4 Sep 2012 07:57:40 +0900 (JST)
Subject: [ruby-changes:24843] emboss:r36894 (trunk): * test/openssl/test_asn1_rb:
emboss 2012-09-04 07:54:12 +0900 (Tue, 04 Sep 2012) New Revision: 36894 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36894 Log: * test/openssl/test_asn1_rb: test/openssl/test_ssl_session.rb: test/openssl/test_x509name.rb: test/openssl/test_buffering.rb: test/openssl/test_x509cert.rb: test/openssl/test_ssl.rb: Refactor code that leads to warnings on Ruby CI. Modified files: trunk/ChangeLog trunk/test/openssl/test_asn1.rb trunk/test/openssl/test_buffering.rb trunk/test/openssl/test_ssl.rb trunk/test/openssl/test_ssl_session.rb trunk/test/openssl/test_x509cert.rb trunk/test/openssl/test_x509name.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 36893) +++ ChangeLog (revision 36894) @@ -1,3 +1,13 @@ +Tue Sep 4 07:48:35 2012 Martin Bosslet <Martin.Bosslet@g...> + + * test/openssl/test_asn1_rb: + test/openssl/test_ssl_session.rb: + test/openssl/test_x509name.rb: + test/openssl/test_buffering.rb: + test/openssl/test_x509cert.rb: + test/openssl/test_ssl.rb: Refactor code that leads to warnings on + Ruby CI. + Tue Sep 4 07:02:56 2012 Martin Bosslet <Martin.Bosslet@g...> * test/openssl/utils.rb: Use DSS1 as DSA signature digest for all Index: test/openssl/test_x509cert.rb =================================================================== --- test/openssl/test_x509cert.rb (revision 36893) +++ test/openssl/test_x509cert.rb (revision 36894) @@ -38,7 +38,6 @@ ] sha1 = OpenSSL::Digest::SHA1.new - dss1 = OpenSSL::Digest::DSS1.new dsa_digest = OpenSSL::TestUtils::DSA_SIGNATURE_DIGEST.new [ @@ -168,20 +167,20 @@ end assert_raise(OpenSSL::X509::CertificateError){ - cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [], - nil, nil, OpenSSL::Digest::MD5.new) + issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [], + nil, nil, OpenSSL::Digest::MD5.new) } end def test_dsig_algorithm_mismatch assert_raise(OpenSSL::X509::CertificateError) do - cert = issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [], - nil, nil, OpenSSL::Digest::DSS1.new) + issue_cert(@ca, @rsa2048, 1, Time.now, Time.now+3600, [], + nil, nil, OpenSSL::Digest::DSS1.new) end if OpenSSL::OPENSSL_VERSION_NUMBER < 0x10001000 # [ruby-core:42949] assert_raise(OpenSSL::X509::CertificateError) do - cert = issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [], - nil, nil, OpenSSL::Digest::MD5.new) + issue_cert(@ca, @dsa512, 1, Time.now, Time.now+3600, [], + nil, nil, OpenSSL::Digest::MD5.new) end end Index: test/openssl/test_ssl.rb =================================================================== --- test/openssl/test_ssl.rb (revision 36893) +++ test/openssl/test_ssl.rb (revision 36894) @@ -579,7 +579,7 @@ ctx.npn_select_cb = -> (protocols) { "a" * 256 } assert_raise(*HANDSHAKE_ERRORS) { server_connect(port, ctx) } } - end + end end Index: test/openssl/test_asn1.rb =================================================================== --- test/openssl/test_asn1.rb (revision 36893) +++ test/openssl/test_asn1.rb (revision 36894) @@ -247,7 +247,7 @@ assert_equal(false, prim.infinite_length) prim.infinite_length = true flunk('Could set infinite length on primitive value') - rescue NoMethodError => e + rescue NoMethodError #ok end end Index: test/openssl/test_ssl_session.rb =================================================================== --- test/openssl/test_ssl_session.rb (revision 36893) +++ test/openssl/test_ssl_session.rb (revision 36894) @@ -135,7 +135,7 @@ def test_session_timeout sess = OpenSSL::SSL::Session.new(DUMMY_SESSION_NO_EXT) assert_raise(TypeError) do - sess.timeout = (now = Time.now) + sess.timeout = Time.now end sess.timeout = 1 assert_equal(1, sess.timeout.to_i) @@ -337,8 +337,8 @@ } server_proc = Proc.new { |c, ssl| - session = ssl.session - stats = c.session_cache_stats + ssl.session + c.session_cache_stats readwrite_loop(c, ssl) } start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => ctx_proc, :server_proc => server_proc) do |server, port| Index: test/openssl/test_x509name.rb =================================================================== --- test/openssl/test_x509name.rb (revision 36893) +++ test/openssl/test_x509name.rb (revision 36894) @@ -339,7 +339,7 @@ n1 = OpenSSL::X509::Name.parse 'CN=a' n2 = OpenSSL::X509::Name.parse 'CN=b' - assert_equal -1, n1 <=> n2 + assert_equal(-1, n1 <=> n2) end def name_hash(name) Index: test/openssl/test_buffering.rb =================================================================== --- test/openssl/test_buffering.rb (revision 36893) +++ test/openssl/test_buffering.rb (revision 36894) @@ -70,7 +70,6 @@ def test_getc @io.syswrite('abc') - res = [] assert_equal(?a, @io.getc) assert_equal(?b, @io.getc) assert_equal(?c, @io.getc) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/