nobu	2014-12-13 09:20:00 +0900 (Sat, 13 Dec 2014)

  New Revision: 48819

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48819

  Log:
    test_ocsp.rb: run separately
    
    * test/openssl/test_ocsp.rb (test_new_ocsp_request): run in a
      separated process to continue on CentOS 5.6 i386.

  Modified files:
    trunk/test/openssl/test_ocsp.rb
    trunk/test/openssl/utils.rb
Index: test/openssl/utils.rb
===================================================================
--- test/openssl/utils.rb	(revision 48818)
+++ test/openssl/utils.rb	(revision 48819)
@@ -327,4 +327,24 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOP https://github.com/ruby/ruby/blob/trunk/test/openssl/utils.rb#L327
     end
   end
 
+  module OpenSSL::OCSPTestSetup
+    def setup
+      ca_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
+      ca_key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+      ca_serial = 0xabcabcabcabc
+
+      subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert")
+      @key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+      serial = 0xabcabcabcabd
+
+      now = Time.at(Time.now.to_i) # suppress usec
+      dgst = OpenSSL::Digest::SHA1.new
+
+      @ca_cert = OpenSSL::TestUtils.issue_cert(
+        ca_subj, ca_key, ca_serial, now, now+3600, [], nil, nil, dgst)
+      @cert = OpenSSL::TestUtils.issue_cert(
+        subj, @key, serial, now, now+3600, [], @ca_cert, nil, dgst)
+    end
+  end
+
 end if defined?(OpenSSL)
Index: test/openssl/test_ocsp.rb
===================================================================
--- test/openssl/test_ocsp.rb	(revision 48818)
+++ test/openssl/test_ocsp.rb	(revision 48819)
@@ -3,23 +3,7 @@ require_relative "utils" https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ocsp.rb#L3
 if defined?(OpenSSL)
 
 class OpenSSL::TestOCSP < Test::Unit::TestCase
-  def setup
-    ca_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
-    ca_key = OpenSSL::TestUtils::TEST_KEY_RSA1024
-    ca_serial = 0xabcabcabcabc
-
-    subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert")
-    @key = OpenSSL::TestUtils::TEST_KEY_RSA1024
-    serial = 0xabcabcabcabd
-
-    now = Time.at(Time.now.to_i) # suppress usec
-    dgst = OpenSSL::Digest::SHA1.new
-
-    @ca_cert = OpenSSL::TestUtils.issue_cert(
-       ca_subj, ca_key, ca_serial, now, now+3600, [], nil, nil, dgst)
-    @cert = OpenSSL::TestUtils.issue_cert(
-       subj, @key, serial, now, now+3600, [], @ca_cert, nil, dgst)
-  end
+  include OpenSSL::OCSPTestSetup
 
   def test_new_certificate_id
     cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert)
@@ -34,6 +18,9 @@ class OpenSSL::TestOCSP < Test::Unit::Te https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ocsp.rb#L18
   end if defined?(OpenSSL::Digest::SHA256)
 
   def test_new_ocsp_request
+    assert_separately(%w[-ropenssl/utils -], <<-END)
+    extend OpenSSL::OCSPTestSetup
+    setup
     request = OpenSSL::OCSP::Request.new
     cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert, OpenSSL::Digest::SHA1.new)
     request.add_certid(cid)
@@ -41,6 +28,7 @@ class OpenSSL::TestOCSP < Test::Unit::Te https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ocsp.rb#L28
     assert_kind_of OpenSSL::OCSP::Request, request
     # in current implementation not same instance of certificate id, but should contain same data
     assert_equal cid.serial, request.certid.first.serial
+    END
   end
 end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/