merge from trunk (r27877, r27879, r27880, r27883, r27884)

* test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine): skip if
  they are not implemented.

* test/socket/test_addrinfo.rb: ipaddr.rb defines Socket::AF_INET6 as an Object
  if the constant is not available.

* test/logger/test_logger.rb: close logger (or logdevice) if it's related to
  a file because some platforms such as Windows cannot remove opened files.

* test/openssl/test_ssl.rb (server_loop): treat Errno::ENOTSOCK just like as
  Errno::EBADF and Errno::EINVAL.

* test/openssl/test_ssl.rb (test_client_auth): Errno::ECONNRESET is raised on
  Windows.


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

4 files changed, 40 insertions, 15 deletions

diff --git a/test/logger/test_logger.rb b/test/logger/test_logger.rb
index f83070c7f4..576bec519f 100644
--- a/test/logger/test_logger.rb
+++ b/test/logger/test_logger.rb
@@ -311,10 +311,14 @@ class TestLogDevice < Test::Unit::TestCase
     end
     # create logfile whitch is already exist.
     logdev = d(@filename)
-    logdev.write('world')
-    logfile = File.read(@filename)
-    assert_equal(2, logfile.split(/\n/).size)
-    assert_match(/^helloworld$/, logfile)
+    begin
+      logdev.write('world')
+      logfile = File.read(@filename)
+      assert_equal(2, logfile.split(/\n/).size)
+      assert_match(/^helloworld$/, logfile)
+    ensure
+      logdev.close
+    end
   end
 
   def test_write
@@ -464,6 +468,7 @@ class TestLogDevice < Test::Unit::TestCase
       assert(File.exist?(filename2))
       assert(File.exist?(filename3))
     ensure
+      logger.close if logger
       [filename1, filename2, filename3].each do |filename|
         File.unlink(filename) if File.exist?(filename)
       end
@@ -491,20 +496,32 @@ class TestLoggerApplication < Test::Unit::TestCase
 
   def test_start
     @app.set_log(@filename)
-    @app.level = Logger::UNKNOWN
-    @app.start # logs FATAL log 
-    assert_equal(1, File.read(@filename).split(/\n/).size)
+    begin
+      @app.level = Logger::UNKNOWN
+      @app.start # logs FATAL log 
+      assert_equal(1, File.read(@filename).split(/\n/).size)
+    ensure
+      @app.logger.close
+    end
   end
 
   def test_logger
     @app.level = Logger::WARN
     @app.set_log(@filename)
-    assert_equal(Logger::WARN, @app.logger.level)
+    begin
+      assert_equal(Logger::WARN, @app.logger.level)
+    ensure
+      @app.logger.close
+    end
     @app.logger = logger = Logger.new(STDOUT)
     assert_equal(logger, @app.logger)
     assert_equal(Logger::WARN, @app.logger.level)
     @app.log = @filename
-    assert(logger != @app.logger)
-    assert_equal(Logger::WARN, @app.logger.level)
+    begin
+      assert(logger != @app.logger)
+      assert_equal(Logger::WARN, @app.logger.level)
+    ensure
+      @app.logger.close
+    end
   end
 end
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index ef442d41d0..558bf1bce4 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -80,7 +80,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
         server_proc.call(ctx, ssl)
       end
     end
-  rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED
+  rescue Errno::EBADF, IOError, Errno::EINVAL, Errno::ECONNABORTED, Errno::ENOTSOCK
   end
 
   def start_server(port0, verify_mode, start_immediately, args = {}, &block)
@@ -245,7 +245,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
   def test_client_auth
     vflag = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
     start_server(PORT, vflag, true){|server, port|
-      assert_raise(OpenSSL::SSL::SSLError){
+      assert_raise(OpenSSL::SSL::SSLError, Errno::ECONNRESET){
         sock = TCPSocket.new("127.0.0.1", port)
         ssl = OpenSSL::SSL::SSLSocket.new(sock)
         ssl.connect
diff --git a/test/socket/test_addrinfo.rb b/test/socket/test_addrinfo.rb
index 4c3babdfa8..77ef0ae321 100644
--- a/test/socket/test_addrinfo.rb
+++ b/test/socket/test_addrinfo.rb
@@ -444,7 +444,7 @@ class TestSocketAddrinfo < Test::Unit::TestCase
     assert_equal(ai1.canonname, ai2.canonname)
   end
 
-  if Socket.const_defined?("AF_INET6")
+  if Socket.const_defined?("AF_INET6") && Socket::AF_INET6.is_a?(Integer)
 
     def test_addrinfo_new_inet6
       ai = Addrinfo.new(["AF_INET6", 42304, "ip6-localhost", "::1"])
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb
index 1aaf3fac8c..6b13cf6026 100644
--- a/test/zlib/test_zlib.rb
+++ b/test/zlib/test_zlib.rb
@@ -665,7 +665,11 @@ if defined? Zlib
     def test_adler32_combine
       one = Zlib.adler32("fo")
       two = Zlib.adler32("o")
-      assert_equal(0x02820145, Zlib.adler32_combine(one, two, 1))
+      begin
+        assert_equal(0x02820145, Zlib.adler32_combine(one, two, 1))
+      rescue NotImplementedError
+        skip "adler32_combine is not implemented"
+      end
     end
 
     def test_crc32
@@ -678,7 +682,11 @@ if defined? Zlib
     def test_crc32_combine
       one = Zlib.crc32("fo")
       two = Zlib.crc32("o")
-      assert_equal(0x8c736521, Zlib.crc32_combine(one, two, 1))
+      begin
+        assert_equal(0x8c736521, Zlib.crc32_combine(one, two, 1))
+      rescue NotImplementedError
+        skip "crc32_combine is not implemented"
+      end
     end
 
     def test_crc_table