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

1 files changed, 10 insertions, 2 deletions

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