Skip to content

Commit

Permalink
Merge "Fix import problem in test_virt_disk_vfs_localfs."
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Nov 29, 2012
2 parents 5019602 + aa22b37 commit 4b24907
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions nova/tests/test_virt_disk_vfs_localfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

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
Expand Down Expand Up @@ -133,15 +133,15 @@ def nonroot_execute(*cmd_parts, **kwargs):
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"
ret = vfs._canonical_path('etc/something.conf')
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"
Expand Down

0 comments on commit 4b24907

Please sign in to comment.