reverting; http://rubyforge.org/tracker/?func=detail&atid=4099&aid=28566&group_id=1040

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 16 deletions

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