mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
a0d2cd2e1e
commit
63a164f32e
3 changed files with 16 additions and 7 deletions
|
@ -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
|
||||
|
|
|
@ -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]
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue