valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Full module path import

Browse Source
This commit is contained in:
Pedro Algarvio 2017-02-17 21:43:26 +00:00
parent 2ebb0a56cc
commit fbc2af52fc
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration/cloud/helpers/virtualbox.py
View File

@ -13,7 +13,7 @@ from salttesting import skipIf
# Import Salt libs
import salt.ext.six as six
import integration
from salt.utils import virtualbox
import salt.utils.virtualbox
# Create the cloud instance name to be used throughout the tests
INSTANCE_NAME = integration.cloud.helpers.random_name()
@ -34,10 +34,10 @@ log.setLevel(logging.INFO)
info = log.info
@skipIf(virtualbox.HAS_LIBS is False, 'virtualbox has to be installed')
@skipIf(salt.utils.virtualbox.HAS_LIBS is False, 'virtualbox has to be installed')
class VirtualboxTestCase(unittest.TestCase):
def setUp(self):
self.vbox = virtualbox.vb_get_box()
self.vbox = salt.utils.virtualbox.vb_get_box()
def assertMachineExists(self, name, msg=None):
try:
@ -52,7 +52,7 @@ class VirtualboxTestCase(unittest.TestCase):
self.assertRaisesRegexp(Exception, "Could not find a registered machine", self.vbox.findMachine, name)
@skipIf(virtualbox.HAS_LIBS is False, 'salt-cloud requires virtualbox to be installed')
@skipIf(salt.utils.virtualbox.HAS_LIBS is False, 'salt-cloud requires virtualbox to be installed')
class VirtualboxCloudTestCase(integration.ShellCase):
def run_cloud(self, arg_str, catch_stderr=False, timeout=None):
"""