summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/net/http/test_http.rb5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a81b0647a..201099c7f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 24 20:20:05 2005 Minero Aoki <aamine@loveruby.net>
+
+ * test/net/http/test_http.rb (teardown): ensure that Net::HTTP is
+ version 1.2. [ruby-dev:27312]
+
Sat Sep 24 11:44:28 2005 Minero Aoki <aamine@loveruby.net>
* test/net/http/test_http.rb: new file.
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
index 2e9a17e2b0..ea0d7cf343 100644
--- a/test/net/http/test_http.rb
+++ b/test/net/http/test_http.rb
@@ -270,6 +270,11 @@ module TestNetHTTPUtils
spawn_server
end
+ def teardown
+ # resume global state
+ Net::HTTP.version_1_2
+ end
+
def spawn_server
return if $test_net_http_server_running
server = WEBrick::HTTPServer.new(