From 610b5d79759706fb2688b652da1c21006f9d4af2 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 19 Mar 2004 07:13:01 +0000 Subject: * variable.c (rb_cvar_set): class variables become private to the particular class/module. [Ruby2] * variable.c (rb_cvar_get): ditto. * io.c (rb_io_sync): need not to check writable. [ruby-core:02674] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5977 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/drb/drbtest.rb | 8 +++++++- test/drb/test_drbssl.rb | 4 ++-- test/drb/test_drbunix.rb | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'test/drb') diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb index 792cdcb7c7..c95b900235 100644 --- a/test/drb/drbtest.rb +++ b/test/drb/drbtest.rb @@ -12,9 +12,15 @@ class DRbService ) @@ruby += " -d" if $DEBUG @@dir = File.dirname(File.expand_path(__FILE__)) + def self.manager + @@manager + end + def self.add_service_command(nm) + DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}" + end %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb).each do |nm| - DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}" + add_service_command(nm) end @server = @@server = DRb::DRbServer.new(nil, @@manager, {}) def self.manager diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb index b5dd68f6a7..c12a43bb75 100644 --- a/test/drb/test_drbssl.rb +++ b/test/drb/test_drbssl.rb @@ -10,7 +10,7 @@ if Object.const_defined?("OpenSSL") class DRbSSLService < DRbService %w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm| - DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}" + add_service_command(nm) end config = Hash.new @@ -30,7 +30,7 @@ class DRbSSLService < DRbService end uri = ARGV.shift if $0 == __FILE__ - @server = DRb::DRbServer.new(uri || 'drbssl://:0', @@manager, config) + @server = DRb::DRbServer.new(uri || 'drbssl://:0', self.manager, config) end class TestDRbSSLCore < Test::Unit::TestCase diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb index e35a7bd580..eeaa9c93ef 100644 --- a/test/drb/test_drbunix.rb +++ b/test/drb/test_drbunix.rb @@ -10,11 +10,11 @@ if Object.const_defined?("UNIXServer") class DRbUNIXService < DRbService %w(ut_drb_drbunix.rb ut_array_drbunix.rb).each do |nm| - DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}" + add_service_command(nm) end uri = ARGV.shift if $0 == __FILE__ - @server = DRb::DRbServer.new(uri || 'drbunix:', @@manager, {}) + @server = DRb::DRbServer.new(uri || 'drbunix:', self.manager, {}) end class TestDRbUNIXCore < Test::Unit::TestCase -- cgit v1.2.3