Move @skipIf to parent classes

Related to saltstack#27089 Saltcloud virtualbox provider
LoveIsGrief · Feb 10, 2016 · e5f8227 · e5f8227
1 parent 002ce06
commit e5f8227
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tests/integration/cloud/helpers/virtualbox.py b/tests/integration/cloud/helpers/virtualbox.py
@@ -2,6 +2,7 @@
 import logging
 import os
 import unittest
+from unittest2 import skipIf
 
 import integration
 from integration.cloud.helpers import random_name
@@ -26,6 +27,7 @@
 info = log.info
 
 
+@skipIf(virtualbox.HAS_LIBS is False, 'virtualbox has to be installed')
 class VirtualboxTestCase(unittest.TestCase):
     def setUp(self):
         self.vbox = virtualbox.vb_get_box()
@@ -43,6 +45,7 @@ def assertMachineDoesNotExist(self, name, msg=None):
         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')
 class VirtualboxCloudTestCase(integration.ShellCase):
     def run_cloud(self, arg_str, catch_stderr=False, timeout=None):
         """

diff --git a/tests/integration/cloud/providers/virtualbox.py b/tests/integration/cloud/providers/virtualbox.py
@@ -23,7 +23,7 @@
 import integration
 from salt.config import cloud_providers_config, vm_profiles_config
 from utils.virtualbox import vb_xpcom_to_attribute_dict, vb_clone_vm, vb_destroy_machine, vb_create_machine, \
-    vb_get_box, vb_machine_exists, HAS_LIBS, XPCOM_ATTRIBUTES, vb_start_vm, vb_stop_vm, \
+    vb_get_box, vb_machine_exists, XPCOM_ATTRIBUTES, vb_start_vm, vb_stop_vm, \
     vb_get_network_addresses, vb_wait_for_network_address, machine_get_machinestate_str
 
 # Setup logging
@@ -46,7 +46,6 @@
 ]
 
 
-@skipIf(HAS_LIBS is False, 'salt-cloud requires virtualbox to be installed')
 class VirtualboxProviderTest(VirtualboxCloudTestCase):
     """
     Integration tests for the Virtualbox cloud provider using the Virtualbox driver