From 23c60ca30a9c401a6b3cc3969cb732a245f29cd5 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 10 Jan 2014 17:38:18 +0100 Subject: [PATCH] Fix potential fd leak Always close the test socket. Change-Id: Ic87b713a7791cf39ed5146754e1345fc662c894e --- nova/tests/test_test_utils.py | 3 ++- nova/tests/utils.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nova/tests/test_test_utils.py b/nova/tests/test_test_utils.py index 2184d39af834..10a689f9c156 100644 --- a/nova/tests/test_test_utils.py +++ b/nova/tests/test_test_utils.py @@ -16,6 +16,7 @@ import errno import socket +import tempfile import fixtures @@ -57,7 +58,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()) diff --git a/nova/tests/utils.py b/nova/tests/utils.py index d3ffcd5b4424..c323efcfaf55 100644 --- a/nova/tests/utils.py +++ b/nova/tests/utils.py @@ -188,6 +188,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