From deb0519aec1e68bdcf019d99e3e8be55fd5b2faf Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 13 Apr 2012 06:21:50 +0000
Subject: * lib/webrick/server.rb (WEBrick::GenericServer#stop): fix r35303;  
 this method is to deny new connections, not shutdown yet.

* lib/webrick/server.rb (WEBrick::GenericServer#start):
  re-raise exception only when the exception is Interrupt (^C).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/webrick/test_server.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'test/webrick')

diff --git a/test/webrick/test_server.rb b/test/webrick/test_server.rb
index 534fe9b077..86fccac09c 100644
--- a/test/webrick/test_server.rb
+++ b/test/webrick/test_server.rb
@@ -29,23 +29,22 @@ class TestWEBrickServer < Test::Unit::TestCase
       :StopCallback => Proc.new{ stopped += 1 },
     }
 
-    e = assert_raises(Exception) do
+    e = assert_raises(Interrupt) do
       TestWEBrick.start_server(Echo, config) { |server, addr, port, log|
         listener = server.listeners.first
 
         def listener.accept
-          raise Exception, 'fatal' # simulate ^C
+          Process.kill(:INT, $$) # simulate ^C
         end
 
-        true while server.status != :Running
+        Thread.pass while server.status != :Running
 
         TCPSocket.open(addr, port) { |sock| sock << "foo\n" }
 
-        sleep 0.1 until server.status == :Stop
+        Thread.pass until server.status == :Stop
       }
     end
 
-    assert_equal('fatal', e.message)
     assert_equal(stopped, 1)
   end
 
-- 
cgit v1.2.3