aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/net/http/test_http.rb4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 85c7cbebf3..cbbfebf86c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 10 11:35:36 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/net/http/test_http.rb (TestNetHTTP_v1_2#test_get,
+ TestNetHTTP_v1_2_chunked#test_get): shoudn't check
+ HttpResponse#decode_content if Zlib is not available.
+ ko1 complained via IRC.
+
Wed Jul 10 10:20:07 2013 NARUSE, Yui <naruse@ruby-lang.org>
* tool/rbinstall.rb: always require rubygems to stabilize rubygems
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
index b83844377f..709a2e2370 100644
--- a/test/net/http/test_http.rb
+++ b/test/net/http/test_http.rb
@@ -233,7 +233,7 @@ module TestNetHTTP_version_1_1_methods
http.get('/', { 'User-Agent' => 'test' }.freeze)
}
- assert res.decode_content, '[Bug #7924]'
+ assert res.decode_content, '[Bug #7924]' if Net::HTTP::HAVE_ZLIB
end
def _test_get__iter(http)
@@ -460,7 +460,7 @@ module TestNetHTTP_version_1_2_methods
assert_equal $test_net_http_data.size, res.body.size
assert_equal $test_net_http_data, res.body
- refute res.decode_content, 'Bug #7831'
+ refute res.decode_content, 'Bug #7831' if Net::HTTP::HAVE_ZLIB
}
end