diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-29 02:12:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-29 02:12:35 +0000 |
| commit | 4b24907b679f26d976435e2dfb307db8fcfadc29 (patch) | |
| tree | 48b5843a6e53d470cd858c603d7b464eef71b622 | |
| parent | 5019602b3313549116500b47083bc34bfef24e35 (diff) | |
| parent | aa22b376e8962693883859616be30a2a1321e013 (diff) | |
| download | nova-4b24907b679f26d976435e2dfb307db8fcfadc29.tar.gz nova-4b24907b679f26d976435e2dfb307db8fcfadc29.tar.xz nova-4b24907b679f26d976435e2dfb307db8fcfadc29.zip | |
Merge "Fix import problem in test_virt_disk_vfs_localfs."
| -rw-r--r-- | nova/tests/test_virt_disk_vfs_localfs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_virt_disk_vfs_localfs.py b/nova/tests/test_virt_disk_vfs_localfs.py index 04dbad168..4d0ebd5ed 100644 --- a/nova/tests/test_virt_disk_vfs_localfs.py +++ b/nova/tests/test_virt_disk_vfs_localfs.py @@ -18,7 +18,7 @@ import sys from nova import exception from nova import test -from nova import tests +from nova.tests import utils as tests_utils from nova import utils from nova.virt.disk.vfs import localfs as vfsimpl @@ -133,7 +133,7 @@ class VirtDiskVFSLocalFSTestPaths(test.TestCase): self.stubs.Set(utils, 'execute', nonroot_execute) def test_check_safe_path(self): - if tests.utils.is_osx(): + if tests_utils.is_osx(): self.skipTest("Unable to test on OSX") vfs = vfsimpl.VFSLocalFS("dummy.img") vfs.imgdir = "/foo" @@ -141,7 +141,7 @@ class VirtDiskVFSLocalFSTestPaths(test.TestCase): self.assertEquals(ret, '/foo/etc/something.conf') def test_check_unsafe_path(self): - if tests.utils.is_osx(): + if tests_utils.is_osx(): self.skipTest("Unable to test on OSX") vfs = vfsimpl.VFSLocalFS("dummy.img") vfs.imgdir = "/foo" |