1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merges r29257 and r29258 from trunk into ruby_1_9_2.

--
	* test/net/imap/test_imap.rb: "localhost" not guaranteed to
	  resolve to "127.0.0.1".  On my machine it is "::1" instead.
	  The problem is, you have to connect to the imaps server via
	  the canonical name written in a server certificate, and that
	  of the server.cert is "localhost".  So you have to listen to
	  the address of what "localhost" resolves to.  I think this
	  situation cannot be resolved in a handy manner because the
	  test "test_imaps_post_connection_check" is actually
	  expecting to connect to a server via an address other than
	  the CN.  On my machine several assertions won't pass because
	  the test cannot connect to the server.
--
add ChangeLog entry for the previous one.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-11-24 09:37:06 +00:00
parent 14dfd98ee4
commit 483d85b157
3 changed files with 22 additions and 8 deletions

View file

@ -1,3 +1,17 @@
Wed Sep 15 13:37:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* test/net/imap/test_imap.rb: "localhost" not guaranteed to
resolve to "127.0.0.1". On my machine it is "::1" instead.
The problem is, you have to connect to the imaps server via
the canonical name written in a server certificate, and that
of the server.cert is "localhost". So you have to listen to
the address of what "localhost" resolves to. I think this
situation cannot be resolved in a handy manner because the
test "test_imaps_post_connection_check" is actually
expecting to connect to a server via an address other than
the CN. On my machine several assertions won't pass because
the test cannot connect to the server.
Wed Sep 15 09:12:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_puts): fix for wide char encoding strings.

View file

@ -73,7 +73,7 @@ class IMAPTest < Test::Unit::TestCase
if defined?(OpenSSL)
assert_nothing_raised do
imaps_test do |port|
Net::IMAP.new("localhost",
Net::IMAP.new(SERVER_ADDR,
:port => port,
:ssl => { :verify_mode => OpenSSL::SSL::VERIFY_NONE })
end
@ -129,7 +129,7 @@ class IMAPTest < Test::Unit::TestCase
end
begin
begin
imap = Net::IMAP.new("localhost", :port => port)
imap = Net::IMAP.new(SERVER_ADDR, :port => port)
assert_raise(EOFError) do
imap.logout
end
@ -167,7 +167,7 @@ class IMAPTest < Test::Unit::TestCase
end
begin
begin
imap = Net::IMAP.new("localhost", :port => port)
imap = Net::IMAP.new(SERVER_ADDR, :port => port)
responses = []
imap.idle do |res|
responses.push(res)
@ -219,7 +219,7 @@ class IMAPTest < Test::Unit::TestCase
end
begin
begin
imap = Net::IMAP.new("localhost", :port => port)
imap = Net::IMAP.new(SERVER_ADDR, :port => port)
begin
th = Thread.current
m = Monitor.new
@ -275,7 +275,7 @@ class IMAPTest < Test::Unit::TestCase
end
begin
begin
imap = Net::IMAP.new("localhost", :port => port)
imap = Net::IMAP.new(SERVER_ADDR, :port => port)
assert_raise(Net::IMAP::Error) do
imap.idle_done
end
@ -305,7 +305,7 @@ class IMAPTest < Test::Unit::TestCase
end
begin
begin
imap = Net::IMAP.new("localhost", :port => port)
imap = Net::IMAP.new(SERVER_ADDR, :port => port)
assert_raise(Net::IMAP::ByeResponseError) do
imap.login("user", "password")
end
@ -334,7 +334,7 @@ class IMAPTest < Test::Unit::TestCase
end
begin
begin
imap = Net::IMAP.new("localhost", :port => port)
imap = Net::IMAP.new(SERVER_ADDR, :port => port)
imap.instance_eval do
def @sock.shutdown(*args)
super

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 43
#define RUBY_PATCHLEVEL 44
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1