1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* test/net/imap/test_imap.rb: check OpenSSL definition before testing imaps.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-12-30 20:58:31 +00:00
parent 6ceb07bcdf
commit f7b12afff5
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
test/net/imap/test_imap.rb
View File

@ -19,50 +19,60 @@ class IMAPTest < Test::Unit::TestCase
end end
def test_imaps_unknown_ca def test_imaps_unknown_ca
assert_raise(OpenSSL::SSL::SSLError) do if defined?(OpenSSL)
imaps_test do |port| assert_raise(OpenSSL::SSL::SSLError) do
Net::IMAP.new("localhost", imaps_test do |port|
:port => port, Net::IMAP.new("localhost",
:ssl => true) :port => port,
:ssl => true)
end
end end
end end
end end
def test_imaps_with_ca_file def test_imaps_with_ca_file
assert_nothing_raised do if defined?(OpenSSL)
imaps_test do |port| assert_nothing_raised do
Net::IMAP.new("localhost", imaps_test do |port|
:port => port, Net::IMAP.new("localhost",
:ssl => { :ca_file => CA_FILE }) :port => port,
:ssl => { :ca_file => CA_FILE })
end
end end
end end
end end
def test_imaps_verify_none def test_imaps_verify_none
assert_nothing_raised do if defined?(OpenSSL)
imaps_test do |port| assert_nothing_raised do
Net::IMAP.new("localhost", imaps_test do |port|
:port => port, Net::IMAP.new("localhost",
:ssl => { :verify_mode => OpenSSL::SSL::VERIFY_NONE }) :port => port,
:ssl => { :verify_mode => OpenSSL::SSL::VERIFY_NONE })
end
end end
end end
end end
def test_imaps_post_connection_check def test_imaps_post_connection_check
assert_raise(OpenSSL::SSL::SSLError) do if defined?(OpenSSL)
imaps_test do |port| assert_raise(OpenSSL::SSL::SSLError) do
Net::IMAP.new("127.0.0.1", imaps_test do |port|
:port => port, Net::IMAP.new("127.0.0.1",
:ssl => { :ca_file => CA_FILE }) :port => port,
:ssl => { :ca_file => CA_FILE })
end
end end
end end
end end
def test_starttls def test_starttls
starttls_test do |port| if defined?(OpenSSL)
imap = Net::IMAP.new("localhost", :port => port) starttls_test do |port|
imap.starttls(:ca_file => CA_FILE) imap = Net::IMAP.new("localhost", :port => port)
imap imap.starttls(:ca_file => CA_FILE)
imap
end
end end
end end

6
version.h
View File

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-12-30" #define RUBY_RELEASE_DATE "2007-12-31"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20071230 #define RUBY_RELEASE_CODE 20071231
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12
#define RUBY_RELEASE_DAY 30 #define RUBY_RELEASE_DAY 31
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];