summaryrefslogtreecommitdiff
path: root/test/net
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-13 15:13:21 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-13 15:13:21 +0000
commit474d53f87d528ea8326339faaa8d34f0c5cb8439 (patch)
tree4d235bd69d3487e9742727efcb55d2047ed0f61d /test/net
parente931e27addcd3ff13aca8014f65265fc0a1126d2 (diff)
merge revision(s) 41883,41885:
* 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. TestNetHTTP_v1_2_chunked#test_get): shouldn't check git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/net')
-rw-r--r--test/net/http/test_http.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
index 0b3eeeb6bf..0a0b6ca809 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