From 438a91c0720ac840dedb64085a8c906f855c7422 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 3 Nov 2013 11:26:58 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ test/xmlrpc/webrick_testing.rb | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8f53a994d3..34a1f645be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Nov 3 20:23:38 2013 Tanaka Akira + + * 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 * 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