* test/soap/calc/*, test/soap/helloworkd/*: changed port# of test server.

  (17171)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 14 insertions, 8 deletions

diff --git a/test/soap/calc/server.rb b/test/soap/calc/server.rb
index 12a3968b5a..a93774d909 100644
--- a/test/soap/calc/server.rb
+++ b/test/soap/calc/server.rb
@@ -13,5 +13,5 @@ class CalcServer < SOAP::RPC::StandaloneServer
 end
 
 if $0 == __FILE__
-  status = CalcServer.new('CalcServer', nil, '0.0.0.0', 7000).start
+  status = CalcServer.new('CalcServer', nil, '0.0.0.0', 17171).start
 end
diff --git a/test/soap/calc/server2.rb b/test/soap/calc/server2.rb
index 735721de64..1c9eec68e8 100644
--- a/test/soap/calc/server2.rb
+++ b/test/soap/calc/server2.rb
@@ -16,5 +16,5 @@ class CalcServer2 < SOAP::RPC::StandaloneServer
 end
 
 if $0 == __FILE__
-  status = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', 7000).start
+  status = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', 17171).start
 end
diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb
index 528b3e2d49..e3304a415b 100644
--- a/test/soap/calc/test_calc.rb
+++ b/test/soap/calc/test_calc.rb
@@ -12,8 +12,10 @@ module Calc
 
 
 class TestCalc < Test::Unit::TestCase
+  Port = 17171
+
   def setup
-    @server = CalcServer.new(self.class.name, nil, '0.0.0.0', 7000)
+    @server = CalcServer.new(self.class.name, nil, '0.0.0.0', Port)
     @server.level = Logger::Severity::FATAL
     @t = Thread.new {
       @server.start
@@ -21,7 +23,7 @@ class TestCalc < Test::Unit::TestCase
     while @server.server.nil? or @server.server.status != :Running
       sleep 0.1
     end
-    @calc = SOAP::RPC::Driver.new('http://localhost:7000/', 'http://tempuri.org/calcService')
+    @calc = SOAP::RPC::Driver.new("http://localhost:#{Port}/", 'http://tempuri.org/calcService')
     @calc.add_method('add', 'lhs', 'rhs')
     @calc.add_method('sub', 'lhs', 'rhs')
     @calc.add_method('multi', 'lhs', 'rhs')
diff --git a/test/soap/calc/test_calc2.rb b/test/soap/calc/test_calc2.rb
index 776151ff35..25e686b244 100644
--- a/test/soap/calc/test_calc2.rb
+++ b/test/soap/calc/test_calc2.rb
@@ -12,8 +12,10 @@ module Calc
 
 
 class TestCalc2 < Test::Unit::TestCase
+  Port = 17171
+
   def setup
-    @server = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', 7000)
+    @server = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', Port)
     @server.level = Logger::Severity::FATAL
     @t = Thread.new {
       @server.start
@@ -21,7 +23,7 @@ class TestCalc2 < Test::Unit::TestCase
     while @server.server.nil? or @server.server.status != :Running
       sleep 0.1
     end
-    @var = SOAP::RPC::Driver.new('http://localhost:7000/', 'http://tempuri.org/calcService')
+    @var = SOAP::RPC::Driver.new("http://localhost:#{Port}/", 'http://tempuri.org/calcService')
     @var.add_method('set', 'newValue')
     @var.add_method('get')
     @var.add_method_as('+', 'add', 'rhs')
diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index 6e7bae8d20..0ed5849283 100644
--- a/test/soap/calc/test_calc_cgi.rb
+++ b/test/soap/calc/test_calc_cgi.rb
@@ -16,13 +16,15 @@ class TestCalcCGI < Test::Unit::TestCase
     Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
   )
 
+  Port = 17171
+
   def setup
     logger = Logger.new(STDERR)
     logger.level = Logger::Severity::FATAL
     @server = WEBrick::HTTPServer.new(
       :BindAddress => "0.0.0.0",
       :Logger => logger,
-      :Port => 8808,
+      :Port => Port,
       :AccessLog => [],
       :DocumentRoot => File.dirname(File.expand_path(__FILE__)),
       :CGIPathEnv => ENV['PATH'],
@@ -34,7 +36,7 @@ class TestCalcCGI < Test::Unit::TestCase
     while @server.status != :Running
       sleep 0.1
     end
-    @calc = SOAP::RPC::Driver.new('http://localhost:8808/server.cgi', 'http://tempuri.org/calcService')
+    @calc = SOAP::RPC::Driver.new("http://localhost:#{Port}/server.cgi", 'http://tempuri.org/calcService')
     @calc.add_method('add', 'lhs', 'rhs')
     @calc.add_method('sub', 'lhs', 'rhs')
     @calc.add_method('multi', 'lhs', 'rhs')