diff --git a/nova/tests/fake_libvirt_utils.py b/nova/tests/fake_libvirt_utils.py index aa613f35..51077493 100644 --- a/nova/tests/fake_libvirt_utils.py +++ b/nova/tests/fake_libvirt_utils.py @@ -63,10 +63,6 @@ def remove_logical_volumes(*paths): pass -def ensure_tree(path): - pass - - def write_to_file(path, contents, umask=None): pass diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py index 62153ab1..e34f35f7 100644 --- a/nova/tests/test_imagebackend.py +++ b/nova/tests/test_imagebackend.py @@ -55,8 +55,8 @@ class _ImageTestCase(test.TestCase): os.path.exists(self.TEMPLATE_PATH).AndReturn(False) fn = self.mox.CreateMockAnything() fn(target=self.TEMPLATE_PATH) - self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'ensure_tree') - imagebackend.libvirt_utils.ensure_tree(self.TEMPLATE_DIR) + self.mox.StubOutWithMock(imagebackend.utils, 'ensure_tree') + imagebackend.utils.ensure_tree(self.TEMPLATE_DIR) self.mox.ReplayAll() image = self.image_class(self.INSTANCE, self.NAME) @@ -82,7 +82,7 @@ class _ImageTestCase(test.TestCase): os.path.exists(self.TEMPLATE_PATH).AndReturn(False) fn = self.mox.CreateMockAnything() fn(target=self.TEMPLATE_PATH) - self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'ensure_tree') + self.mox.StubOutWithMock(imagebackend.utils, 'ensure_tree') self.mox.ReplayAll() image = self.image_class(self.INSTANCE, self.NAME) diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index cd7688c8..13ea48af 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -3394,12 +3394,6 @@ disk size: 4.4M''', '')) libvirt_utils.mkfs('ext4', '/my/block/dev') libvirt_utils.mkfs('swap', '/my/swap/block/dev') - def test_ensure_tree(self): - with utils.tempdir() as tmpdir: - testdir = '%s/foo/bar/baz' % (tmpdir,) - libvirt_utils.ensure_tree(testdir) - self.assertTrue(os.path.isdir(testdir)) - def test_write_to_file(self): dst_fd, dst_path = tempfile.mkstemp() try: