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

* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):

Browse source 
should properly ignore MiniTest::Skip

	* lib/minitest/unit.rb (MiniTest::Assertions::assert_raises):
	  ditto.

	* test/net/imap/test_imap.rb: Properly skip SSL tests when
	  localhost is not 127.0.0.1.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-09-15 06:01:00 +00:00
parent 64beb15dbc
commit 6bab4ea991
4 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Wed Sep 15 14:59:49 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
should properly ignore MiniTest::Skip
* lib/minitest/unit.rb (MiniTest::Assertions::assert_raises):
ditto.
* test/net/imap/test_imap.rb: Properly skip SSL tests when
localhost is not 127.0.0.1.
Wed Sep 15 13:37:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* test/net/imap/test_imap.rb: "localhost" not guaranteed to

2
lib/minitest/unit.rb
View file

@ -222,6 +222,8 @@ module MiniTest
begin
yield
should_raise = true
rescue MiniTest::Skip
raise
rescue Exception => e
details = "#{msg}#{mu_pp(exp)} exception expected, not"
assert(exp.any? { |ex|

2
lib/test/unit/assertions.rb
View file

@ -32,6 +32,8 @@ module Test
end
begin
line = __LINE__; yield
rescue MiniTest::Skip
raise
rescue Exception => e
bt = e.backtrace
as = e.instance_of?(MiniTest::Assertion)

22
test/net/imap/test_imap.rb
View file

@ -49,9 +49,13 @@ class IMAPTest < Test::Unit::TestCase
if defined?(OpenSSL)
assert_raise(OpenSSL::SSL::SSLError) do
imaps_test do |port|
Net::IMAP.new("localhost",
:port => port,
:ssl => true)
begin
Net::IMAP.new("localhost",
:port => port,
:ssl => true)
rescue SystemCallError
skip $!
end
end
end
end
@ -61,9 +65,13 @@ class IMAPTest < Test::Unit::TestCase
if defined?(OpenSSL)
assert_nothing_raised do
imaps_test do |port|
Net::IMAP.new("localhost",
:port => port,
:ssl => { :ca_file => CA_FILE })
begin
Net::IMAP.new("localhost",
:port => port,
:ssl => { :ca_file => CA_FILE })
rescue SystemCallError
skip $!
end
end
end
end
@ -104,6 +112,8 @@ class IMAPTest < Test::Unit::TestCase
imap
end
end
rescue SystemCallError
skip $!
ensure
if imap && !imap.disconnected?
imap.disconnect