Fix a recent ipv6 UT regression

This fixes UT failures on systems without the procfs entry
by adding appropriate mocking.  The problem introduced by
the following change:
    https://review.openstack.org/#/c/116826/
    commit 0c963f6140237d8d3f361c6aaa7d2a6b656504db

Also, add a test for the case which the change in question fixed.

Closes-Bug: #1363805
Related-Bug: #1361542
Change-Id: I72842c3446f3275e2288adc411540ab036025ed0

diff --git a/neutron/tests/unit/test_ipv6.py b/neutron/tests/unit/test_ipv6.py
index 2dea82bcb5fb026cff3b7e84e652570f38ab9c57..e5102f4a6116fbe5c02ab2952d4b542e0f1437aa 100644 (file)
--- a/neutron/tests/unit/test_ipv6.py
+++ b/neutron/tests/unit/test_ipv6.py
@@ -57,6 +57,8 @@ class TestIsEnabled(base.BaseTestCase):
     def setUp(self):
         super(TestIsEnabled, self).setUp()
         ipv6_utils._IS_IPV6_ENABLED = None
+        self.mock_exists = mock.patch("os.path.exists",
+                                      return_value=True).start()
         mock_open = mock.patch("__builtin__.open").start()
         self.mock_read = mock_open.return_value.__enter__.return_value.read
 
@@ -70,6 +72,12 @@ class TestIsEnabled(base.BaseTestCase):
         enabled = ipv6_utils.is_enabled()
         self.assertFalse(enabled)
 
+    def test_disabled_non_exists(self):
+        self.mock_exists.return_value = False
+        enabled = ipv6_utils.is_enabled()
+        self.assertFalse(enabled)
+        self.assertFalse(self.mock_read.called)
+
     def test_memoize(self):
         self.mock_read.return_value = "0"
         ipv6_utils.is_enabled()