From aa22b376e8962693883859616be30a2a1321e013 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 28 Nov 2012 20:38:48 -0500 Subject: Fix import problem in test_virt_disk_vfs_localfs. jog0 pointed out that you couldn't run this test, at least directly, using tox. This patch fixes the error. Change-Id: I72e81a9931a1601085932273b61823c32e1472aa --- nova/tests/test_virt_disk_vfs_localfs.py | 6 +++--- 1 file 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" -- cgit