Reset IPv6 detection flag after IPv6 tests

Resets a module level flag that was being left in the
state that the previous test set it to. This was causing
unrelated tests to fail if the last state was left disabled.

Closes-Bug: #1365829
Change-Id: Id3f6cb680f5d832e21966de7d4fa335c0c59697c

diff --git a/neutron/tests/unit/test_ipv6.py b/neutron/tests/unit/test_ipv6.py
index e5102f4a6116fbe5c02ab2952d4b542e0f1437aa..2a0ed9f79ecebd733ad3f3566cafc3715005c6b1 100644 (file)
--- a/neutron/tests/unit/test_ipv6.py
+++ b/neutron/tests/unit/test_ipv6.py
@@ -56,7 +56,11 @@ class TestIsEnabled(base.BaseTestCase):
 
     def setUp(self):
         super(TestIsEnabled, self).setUp()
-        ipv6_utils._IS_IPV6_ENABLED = None
+
+        def reset_detection_flag():
+            ipv6_utils._IS_IPV6_ENABLED = None
+        reset_detection_flag()
+        self.addCleanup(reset_detection_flag)
         self.mock_exists = mock.patch("os.path.exists",
                                       return_value=True).start()
         mock_open = mock.patch("__builtin__.open").start()