aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/net/http/utils.rb8
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index da21d87b23..c2b5e87c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 29 02:16:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * test/net/http/utils.rb (TestNetHTTPUtils#teardown): add nil check.
+
Sun May 29 00:22:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* process.c (before_exec, after_exec): change from macro to function.
diff --git a/test/net/http/utils.rb b/test/net/http/utils.rb
index 32cea2a78c..227c39fc9b 100644
--- a/test/net/http/utils.rb
+++ b/test/net/http/utils.rb
@@ -31,9 +31,11 @@ module TestNetHTTPUtils
end
def teardown
- @server.shutdown
- until @server.status == :Stop
- sleep 0.1
+ if @server
+ @server.shutdown
+ until @server.status == :Stop
+ sleep 0.1
+ end
end
# resume global state
Net::HTTP.version_1_2