summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-08 06:50:03 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-08 06:50:03 +0000
commit63a164f32ed6c62cd40304837ad8f8a3f93a4296 (patch)
tree86eab86b684a6bd49174abb85aa4adda13c201c1
parenta0d2cd2e1eee9765b14506360d51d6b1e2f23b58 (diff)
test: fix test conditions
* test/csv/test_features.rb (TestCSV#test_gzip_reader_bug_fix): test only if zlib is available. * test/csv/test_features.rb (TestCSV#test_gzip_writer_bug_fix): ditto. * test/open-uri/test_open-uri.rb (TestOpenURI#test_content_encoding): ditto. * test/rexml/test_order.rb (OrderTester#test_more_ordering): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xtest/csv/test_features.rb9
-rw-r--r--test/open-uri/test_open-uri.rb7
-rw-r--r--test/rexml/test_order.rb7
3 files changed, 16 insertions, 7 deletions
diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb
index 33166e8d777..1c178d130dc 100755
--- a/test/csv/test_features.rb
+++ b/test/csv/test_features.rb
@@ -7,7 +7,10 @@
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
# under the terms of Ruby's license.
-require "zlib"
+begin
+ require "zlib"
+rescue LoadError
+end
require_relative "base"
@@ -205,7 +208,7 @@ class TestCSV::Features < TestCSV
)
end
assert_equal("\r\n", zipped.row_sep)
- end
+ end if defined?(Zlib::GzipReader)
def test_gzip_writer_bug_fix
tempfile = Tempfile.new(%w"temp .gz")
@@ -223,7 +226,7 @@ class TestCSV::Features < TestCSV
include?($INPUT_RECORD_SEPARATOR),
"@row_sep did not default" )
tempfile.close(true)
- end
+ end if defined?(Zlib::GzipWriter)
def test_inspect_is_smart_about_io_types
str = CSV.new("string,data").inspect
diff --git a/test/open-uri/test_open-uri.rb b/test/open-uri/test_open-uri.rb
index 0cae2d56fd0..2b0cfc622f2 100644
--- a/test/open-uri/test_open-uri.rb
+++ b/test/open-uri/test_open-uri.rb
@@ -2,7 +2,10 @@ require 'test/unit'
require 'open-uri'
require 'webrick'
require 'webrick/httpproxy'
-require 'zlib'
+begin
+ require 'zlib'
+rescue LoadError
+end
class TestOpenURI < Test::Unit::TestCase
@@ -497,7 +500,7 @@ class TestOpenURI < Test::Unit::TestCase
assert_equal(content_gz, f.read.force_encoding("ascii-8bit"))
}
}
- end
+ end if defined?(Zlib::GzipWriter)
# 192.0.2.0/24 is TEST-NET. [RFC3330]
diff --git a/test/rexml/test_order.rb b/test/rexml/test_order.rb
index a87b1c27280..3f874c2052c 100644
--- a/test/rexml/test_order.rb
+++ b/test/rexml/test_order.rb
@@ -1,6 +1,9 @@
require 'rexml_test_utils'
require 'rexml/document'
-require 'zlib'
+begin
+ require 'zlib'
+rescue LoadError
+end
class OrderTester < Test::Unit::TestCase
include REXMLTestUtils
@@ -98,5 +101,5 @@ END
assert_equal( actual[count], n ) unless n =~ /Arrive at/
count += 1
}
- end
+ end if defined?(Zlib::GzipReader)
end