diff options
Diffstat (limited to 'test/drb/test_drbssl.rb')
-rw-r--r-- | test/drb/test_drbssl.rb | 65 |
1 files changed, 31 insertions, 34 deletions
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb index 249e90aa99..6e2e0b1746 100644 --- a/test/drb/test_drbssl.rb +++ b/test/drb/test_drbssl.rb @@ -1,13 +1,34 @@ -require 'test_drb' +require "#{File.dirname(File.expand_path(__FILE__))}/drbtest" require 'drb/ssl' -class TestService - @@scripts = %w(ut_drb_drbssl.rb ut_array_drbssl.rb) +class DRbSSLService < DRbService + %w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm| + DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}" + end + config = Hash.new + + config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER + config[:SSLVerifyCallback] = lambda{ |ok,x509_store| + true + } + begin + data = open("sample.key"){|io| io.read } + config[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(data) + data = open("sample.crt"){|io| io.read } + config[:SSLCertificate] = OpenSSL::X509::Certificate.new(data) + rescue + # $stderr.puts "Switching to use self-signed certificate" + config[:SSLCertName] = + [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ] + end + + @server = DRb::DRbServer.new(ARGV.shift || 'drbssl://:0', @@manager, config) end -class DRbXCoreTest < DRbCoreTest +class TestDRbSSLCore < Test::Unit::TestCase + include DRbCore def setup - @ext = $manager.service('ut_drb_drbssl.rb') + @ext = DRbSSLService.manager.service('ut_drb_drbssl.rb') @there = @ext.front end @@ -22,10 +43,10 @@ class DRbXCoreTest < DRbCoreTest def test_06_timeout ten = Onecky.new(3) - assert_exception(TimeoutError) do + assert_raises(TimeoutError) do @there.do_timeout(ten) end - assert_exception(TimeoutError) do + assert_raises(TimeoutError) do @there.do_timeout(ten) end sleep 3 @@ -33,34 +54,10 @@ class DRbXCoreTest < DRbCoreTest end -class DRbXAryTest < DRbAryTest +class TestDRbSSLAry < Test::Unit::TestCase + include DRbAry def setup - @ext = $manager.service('ut_array_drbssl.rb') + @ext = DRbSSLService.manager.service('ut_array_drbssl.rb') @there = @ext.front end end - -if __FILE__ == $0 - config = Hash.new - - config[:SSLVerifyMode] = OpenSSL::SSL::VERIFY_PEER - config[:SSLVerifyCallback] = lambda{ |ok,x509_store| - true - } - begin - data = open("sample.key"){|io| io.read } - config[:SSLPrivateKey] = OpenSSL::PKey::RSA.new(data) - data = open("sample.crt"){|io| io.read } - config[:SSLCertificate] = OpenSSL::X509::Certificate.new(data) - rescue - $stderr.puts "Switching to use self-signed certificate" - config[:SSLCertName] = - [ ["C","JP"], ["O","Foo.DRuby.Org"], ["CN", "Sample"] ] - end - - $testservice = TestService.new(ARGV.shift || 'drbssl://:0', config) - $manager = $testservice.manager - RUNIT::CUI::TestRunner.run(DRbXCoreTest.suite) - RUNIT::CUI::TestRunner.run(DRbXAryTest.suite) - # exit! -end |