diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-03 11:26:58 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-03 11:26:58 +0000 |
| commit | 438a91c0720ac840dedb64085a8c906f855c7422 (patch) | |
| tree | b60c44cbac4e640a520c7a1c9f456a4ec97b2bf9 | |
| parent | 3b320b782f3003b5ab1b026f5c74f3e5a1c2d24a (diff) | |
* test/xmlrpc/webrick_testing.rb (stop_server): Don't try to shutdown
the server if the server is not started.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/xmlrpc/webrick_testing.rb | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sun Nov 3 20:23:38 2013 Tanaka Akira <akr@fsij.org> + + * test/xmlrpc/webrick_testing.rb (stop_server): Don't try to shutdown + the server if the server is not started. + Sun Nov 3 09:35:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * load.c (rb_feature_p): deal with default loadable suffixes. diff --git a/test/xmlrpc/webrick_testing.rb b/test/xmlrpc/webrick_testing.rb index 300f690b64..e50a94ecdc 100644 --- a/test/xmlrpc/webrick_testing.rb +++ b/test/xmlrpc/webrick_testing.rb @@ -34,6 +34,7 @@ module WEBrick_Testing end def stop_server + return if !defined?(@__server) || !@__server Timeout.timeout(5) { @__server.shutdown Thread.pass while @__started # wait until the server is down |