From e88218ee0f4b04c86ed6f611d4566e38427f3075 Mon Sep 17 00:00:00 2001 From: Michael Still Date: Sun, 26 Aug 2012 21:26:50 +1000 Subject: Move ensure_tree to utils Its useful to people other that virt drivers. Change-Id: I721094a1785d7a275f4bfa8994b7b114a6ec07f6 --- nova/tests/fake_libvirt_utils.py | 4 ---- nova/tests/test_imagebackend.py | 6 +++--- nova/tests/test_libvirt.py | 6 ------ nova/tests/test_utils.py | 8 ++++++++ 4 files changed, 11 insertions(+), 13 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/fake_libvirt_utils.py b/nova/tests/fake_libvirt_utils.py index aa613f35d..510774939 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 62153ab1f..e34f35f74 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 cd7688c80..13ea48af6 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: diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index b4e1ebb3d..fc7cfe75d 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -753,3 +753,11 @@ class DiffDict(test.TestCase): diff = utils.diff_dict(old, new) self.assertEqual(diff, dict(b=['-'])) + + +class EnsureTree(test.TestCase): + def test_ensure_tree(self): + with utils.tempdir() as tmpdir: + testdir = '%s/foo/bar/baz' % (tmpdir,) + utils.ensure_tree(testdir) + self.assertTrue(os.path.isdir(testdir)) -- cgit