Merge "Use stubout instead of manually stubbing out os.path.exists"

1 files changed, 4 insertions, 7 deletions

diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py
index 26af63789..20b2bf81e 100644
--- a/nova/tests/test_wsgi.py
+++ b/nova/tests/test_wsgi.py
@@ -24,16 +24,16 @@ import tempfile
 import unittest
 
 import nova.exception
-import nova.test
+from nova import test
 import nova.wsgi
 
 
-class TestLoaderNothingExists(unittest.TestCase):
+class TestLoaderNothingExists(test.TestCase):
     """Loader tests where os.path.exists always returns False."""
 
     def setUp(self):
-        self._os_path_exists = os.path.exists
-        os.path.exists = lambda _: False
+        super(TestLoaderNothingExists, self).setUp()
+        self.stubs.Set(os.path, 'exists', lambda _: False)
 
     def test_config_not_found(self):
         self.assertRaises(
@@ -41,9 +41,6 @@ class TestLoaderNothingExists(unittest.TestCase):
             nova.wsgi.Loader,
         )
 
-    def tearDown(self):
-        os.path.exists = self._os_path_exists
-
 
 class TestLoaderNormalFilesystem(unittest.TestCase):
     """Loader tests with normal filesystem (unmodified os.path module)."""