5 files changed, 11 insertions, 4 deletions
diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb
index e14dbf5daa..528b3e2d49 100644
--- a/test/soap/calc/test_calc.rb
+++ b/test/soap/calc/test_calc.rb
@@ -14,10 +14,11 @@ module Calc
 class TestCalc < Test::Unit::TestCase
   def setup
     @server = CalcServer.new(self.class.name, nil, '0.0.0.0', 7000)
+    @server.level = Logger::Severity::FATAL
     @t = Thread.new {
       @server.start
     }
-    while @server.server.status != :Running
+    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')
diff --git a/test/soap/calc/test_calc2.rb b/test/soap/calc/test_calc2.rb
index 0e84ca390b..776151ff35 100644
--- a/test/soap/calc/test_calc2.rb
+++ b/test/soap/calc/test_calc2.rb
@@ -14,10 +14,11 @@ module Calc
 class TestCalc2 < Test::Unit::TestCase
   def setup
     @server = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', 7000)
+    @server.level = Logger::Severity::FATAL
     @t = Thread.new {
       @server.start
     }
-    while @server.server.status != :Running
+    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')
diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index 6c89d46c12..6d1204d48c 100644
--- a/test/soap/calc/test_calc_cgi.rb
+++ b/test/soap/calc/test_calc_cgi.rb
@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'soap/rpc/driver'
+require 'logger'
 require 'webrick'
 
 
@@ -9,9 +10,13 @@ module Calc
 
 class TestCalcCGI < Test::Unit::TestCase
   def setup
+    logger = Logger.new(STDERR)
+    logger.level = Logger::Severity::FATAL
     @server = WEBrick::HTTPServer.new(
       :BindAddress => "0.0.0.0",
+      :Logger => logger,
       :Port => 8808,
+      :AccessLog => [],
       :DocumentRoot => File.dirname(File.expand_path(__FILE__)),
       :CGIPathEnv => ENV['PATH']
     )
diff --git a/test/soap/helloworld/hw_s.rb b/test/soap/helloworld/hw_s.rb
index b917f72fc0..970c76a1bd 100644
--- a/test/soap/helloworld/hw_s.rb
+++ b/test/soap/helloworld/hw_s.rb
@@ -2,7 +2,6 @@ require 'soap/rpc/standaloneServer'
 
 class HelloWorldServer < SOAP::RPC::StandaloneServer
   def on_init
-    @log.level = Logger::Severity::DEBUG
     add_method(self, 'hello_world', 'from')
   end
 
diff --git a/test/soap/helloworld/test_helloworld.rb b/test/soap/helloworld/test_helloworld.rb
index 0aa552e4a8..3f12bf4a20 100644
--- a/test/soap/helloworld/test_helloworld.rb
+++ b/test/soap/helloworld/test_helloworld.rb
@@ -14,10 +14,11 @@ module HelloWorld
 class TestHelloWorld < Test::Unit::TestCase
   def setup
     @server = HelloWorldServer.new('hws', 'urn:hws', '0.0.0.0', 2000)
+    @server.level = Logger::Severity::UNKNOWN
     @t = Thread.new {
       @server.start
     }
-    while @server.server.status != :Running
+    while @server.server.nil? or @server.server.status != :Running
       sleep 0.1
     end
     @client = SOAP::RPC::Driver.new('http://localhost:2000/', 'urn:hws')