From aa2f70844280c5c9aaaba76de3d98d4f7d6856af Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Thu, 4 Sep 2014 21:55:47 -0700 Subject: [PATCH] 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 --- neutron/tests/unit/test_ipv6.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neutron/tests/unit/test_ipv6.py b/neutron/tests/unit/test_ipv6.py index e5102f4a6..2a0ed9f79 100644 --- 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() -- 2.45.2