summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-03-02 22:47:19 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2012-03-02 22:47:19 +0000
commita7e1fe42919108ab2aba3b7167e4aa74ca63ce08 (patch)
treeda4ccd68058247aaf728734a0d389033bb2fb4f0
parent8a530832c599f8866e98947976d74a5332d877af (diff)
downloadnova-a7e1fe42919108ab2aba3b7167e4aa74ca63ce08.tar.gz
nova-a7e1fe42919108ab2aba3b7167e4aa74ca63ce08.tar.xz
nova-a7e1fe42919108ab2aba3b7167e4aa74ca63ce08.zip
Use stubout instead of manually stubbing out os.path.exists
Change-Id: I76105662003c7dfdea29a9a7dea20b003111e399
-rw-r--r--nova/tests/test_wsgi.py11
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)."""