diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-27 16:43:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-27 16:43:03 +0000 |
| commit | f10e4480d4c3d7ebcbd97a3e64753bae645e537c (patch) | |
| tree | f285633d5bcbd65afc948f0ef901fae746a22922 /nova/tests | |
| parent | 34c012c709cc5ae577330c7d67ba060293158210 (diff) | |
| parent | e88218ee0f4b04c86ed6f611d4566e38427f3075 (diff) | |
Merge "Move ensure_tree to utils"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/fake_libvirt_utils.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_imagebackend.py | 6 | ||||
| -rw-r--r-- | nova/tests/test_libvirt.py | 6 | ||||
| -rw-r--r-- | nova/tests/test_utils.py | 8 |
4 files changed, 11 insertions, 13 deletions
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 da2a7e306..885cf7e83 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -3393,12 +3393,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 c7a323875..39dc9ab6d 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -762,3 +762,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)) |