mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merges r27691 from trunk into ruby_1_9_2.
-- * test/net/imap/test_imap.rb: use IPv4 for test_imaps_post_connection_check. [ruby-dev:41189] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3328b4c9de
commit
a190fa4fff
2 changed files with 21 additions and 8 deletions
|
|
@ -1,3 +1,8 @@
|
|||
Sun May 9 09:15:03 2010 Shugo Maeda <shugo@ruby-lang.org>
|
||||
|
||||
* test/net/imap/test_imap.rb: use IPv4 for
|
||||
test_imaps_post_connection_check. [ruby-dev:41189]
|
||||
|
||||
Sun May 9 02:57:02 2010 Aaron Patterson <aaron@tenderlovemaking.com>
|
||||
|
||||
* ext/fiddle/lib/fiddle.rb: only require DL if it hasn't been required
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ class IMAPTest < Test::Unit::TestCase
|
|||
SERVER_KEY = File.expand_path("server.key", File.dirname(__FILE__))
|
||||
SERVER_CERT = File.expand_path("server.crt", File.dirname(__FILE__))
|
||||
|
||||
SERVER_ADDR = "127.0.0.1"
|
||||
|
||||
def setup
|
||||
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
|
||||
Socket.do_not_reverse_lookup = true
|
||||
|
|
@ -83,7 +85,9 @@ class IMAPTest < Test::Unit::TestCase
|
|||
if defined?(OpenSSL)
|
||||
assert_raise(OpenSSL::SSL::SSLError) do
|
||||
imaps_test do |port|
|
||||
Net::IMAP.new("127.0.0.1",
|
||||
# SERVER_ADDR is different from the hostname in the certificate,
|
||||
# so the following code should raise a SSLError.
|
||||
Net::IMAP.new(SERVER_ADDR,
|
||||
:port => port,
|
||||
:ssl => { :ca_file => CA_FILE })
|
||||
end
|
||||
|
|
@ -107,7 +111,7 @@ class IMAPTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_unexpected_eof
|
||||
server = TCPServer.new(0)
|
||||
server = create_tcp_server
|
||||
port = server.addr[1]
|
||||
Thread.start do
|
||||
begin
|
||||
|
|
@ -138,7 +142,7 @@ class IMAPTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_idle
|
||||
server = TCPServer.new(0)
|
||||
server = create_tcp_server
|
||||
port = server.addr[1]
|
||||
requests = []
|
||||
Thread.start do
|
||||
|
|
@ -190,7 +194,7 @@ class IMAPTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_exception_during_idle
|
||||
server = TCPServer.new(0)
|
||||
server = create_tcp_server
|
||||
port = server.addr[1]
|
||||
requests = []
|
||||
Thread.start do
|
||||
|
|
@ -255,7 +259,7 @@ class IMAPTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_idle_done_not_during_idle
|
||||
server = TCPServer.new(0)
|
||||
server = create_tcp_server
|
||||
port = server.addr[1]
|
||||
requests = []
|
||||
Thread.start do
|
||||
|
|
@ -284,7 +288,7 @@ class IMAPTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_unexpected_bye
|
||||
server = TCPServer.new(0)
|
||||
server = create_tcp_server
|
||||
port = server.addr[1]
|
||||
Thread.start do
|
||||
begin
|
||||
|
|
@ -314,7 +318,7 @@ class IMAPTest < Test::Unit::TestCase
|
|||
private
|
||||
|
||||
def imaps_test
|
||||
server = TCPServer.new(0)
|
||||
server = create_tcp_server
|
||||
port = server.addr[1]
|
||||
ctx = OpenSSL::SSL::SSLContext.new
|
||||
ctx.ca_file = CA_FILE
|
||||
|
|
@ -352,7 +356,7 @@ class IMAPTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def starttls_test
|
||||
server = TCPServer.new(0)
|
||||
server = create_tcp_server
|
||||
port = server.addr[1]
|
||||
Thread.start do
|
||||
begin
|
||||
|
|
@ -391,4 +395,8 @@ class IMAPTest < Test::Unit::TestCase
|
|||
server.close
|
||||
end
|
||||
end
|
||||
|
||||
def create_tcp_server
|
||||
return TCPServer.new(SERVER_ADDR, 0)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue