Merge "Fix potential fd leak"

nova/tests/test_test_utils.py

@@ -14,6 +14,7 @@
 
 import errno
 import socket
+import tempfile
 
 import fixtures
 
@@ -55,7 +56,7 @@ class TestUtilsTestCase(test.TestCase):
             raise e
 
         def fake_socket_ok(x, y):
-            return
+            return tempfile.TemporaryFile()
 
         with fixtures.MonkeyPatch('socket.socket', fake_socket_fail):
             self.assertFalse(test_utils.is_ipv6_supported())

nova/tests/utils.py

@@ -186,6 +186,7 @@ def is_ipv6_supported():
     has_ipv6_support = socket.has_ipv6
     try:
         s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        s.close()
     except socket.error as e:
         if e.errno == errno.EAFNOSUPPORT:
             has_ipv6_support = False