diff options
author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-09 04:26:05 +0000 |
---|---|---|
committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-09 04:26:05 +0000 |
commit | f34ce620a79db7f21131a912fb6f456ded2d218f (patch) | |
tree | f7a5d476c89b015f662dd1497c690c3e05edeffa /test/drb | |
parent | 417a410892ac5a3c6e70f5d7abc9fd8ba9bc1914 (diff) |
* lib/test/unit/collector/dir.rb: do not ignore exceptions(LoadError
and SystemExitError) while loading a testcase. smell of bug.
* test/testunit/collector/test_dir.rb: add new test of the LoadError.
* test/drb/{test_drbssl.rb,test_drbunix.rb}: do not define testcase if
openssl is not installed.
* test/testunit/collector/test_dir.rb: assert_raises -> assert_raise.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/drb')
-rw-r--r-- | test/drb/test_drbssl.rb | 12 | ||||
-rw-r--r-- | test/drb/test_drbunix.rb | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb index 0ca177fe58..1e7e49a72c 100644 --- a/test/drb/test_drbssl.rb +++ b/test/drb/test_drbssl.rb @@ -1,6 +1,13 @@ $:.unshift(File.dirname(File.expand_path(__FILE__))) require 'drbtest' -require 'drb/ssl' + +begin + require 'drb/ssl' +rescue LoadError +end + +if Object.const_defined?("OpenSSL") + class DRbSSLService < DRbService %w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm| @@ -63,3 +70,6 @@ class TestDRbSSLAry < Test::Unit::TestCase @there = @ext.front end end + + +end diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb index e05637a2b7..88f47ddbb7 100644 --- a/test/drb/test_drbunix.rb +++ b/test/drb/test_drbunix.rb @@ -1,6 +1,13 @@ $:.unshift(File.dirname(File.expand_path(__FILE__))) require 'drbtest' -require 'drb/unix' + +begin + require 'drb/unix' +rescue LoadError +end + +if Object.const_defined?("UNIXServer") + class DRbUNIXService < DRbService %w(ut_drb_drbunix.rb ut_array_drbunix.rb).each do |nm| @@ -46,3 +53,6 @@ class TestDRbUNIXAry < Test::Unit::TestCase @there = @ext.front end end + + +end |