mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
3b320b782f
commit
438a91c072
2 changed files with 6 additions and 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>
|
Sun Nov 3 09:35:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* load.c (rb_feature_p): deal with default loadable suffixes.
|
* load.c (rb_feature_p): deal with default loadable suffixes.
|
||||||
|
|
|
@ -34,6 +34,7 @@ module WEBrick_Testing
|
||||||
end
|
end
|
||||||
|
|
||||||
def stop_server
|
def stop_server
|
||||||
|
return if !defined?(@__server) || !@__server
|
||||||
Timeout.timeout(5) {
|
Timeout.timeout(5) {
|
||||||
@__server.shutdown
|
@__server.shutdown
|
||||||
Thread.pass while @__started # wait until the server is down
|
Thread.pass while @__started # wait until the server is down
|
||||||
|
|
Loading…
Reference in a new issue