1 files changed, 6 insertions, 0 deletions
diff --git a/test/soap/helloworld/test_helloworld.rb b/test/soap/helloworld/test_helloworld.rb
index 2819f86b45..bc1937bea1 100644
--- a/test/soap/helloworld/test_helloworld.rb
+++ b/test/soap/helloworld/test_helloworld.rb
@@ -18,10 +18,15 @@ class TestHelloWorld < Test::Unit::TestCase
     @server = HelloWorldServer.new('hws', 'urn:hws', '0.0.0.0', Port)
     @server.level = Logger::Severity::UNKNOWN
     @t = Thread.new {
+      Thread.current.abort_on_exception = true
       @server.start
     }
     while @server.server.nil? or @server.server.status != :Running
       sleep 0.1
+      unless @t.alive?
+	@t.join
+	raise
+      end
     end
     @client = SOAP::RPC::Driver.new("http://localhost:#{Port}/", 'urn:hws')
     @client.add_method("hello_world", "from")
@@ -30,6 +35,7 @@ class TestHelloWorld < Test::Unit::TestCase
   def teardown
     @server.server.shutdown
     @t.kill
+    @t.join
   end
 
   def test_hello_world