Reorder imports and don't even run setUp is expensive tests are not enabled

This commit is contained in:
Pedro Algarvio 2014-06-23 00:58:39 +01:00
parent 8747261f47
commit 992cdc07b1

View File

@ -6,16 +6,16 @@
# Import Python Libs
import os
# Import Salt Libs
import integration
from salt.config import cloud_providers_config
# Import Salt Testing Libs
from salttesting import skipIf
from salttesting.helpers import ensure_in_syspath, expensiveTest
ensure_in_syspath('../../../')
# Import Salt Libs
import integration
from salt.config import cloud_providers_config
# Import Third-Party Libs
try:
import libcloud # pylint: disable=W0611
@ -30,6 +30,7 @@ class LinodeTest(integration.ShellCase):
Integration tests for the Linode cloud provider in Salt-Cloud
'''
@expensiveTest
def setUp(self):
'''
Sets up the test requirements
@ -63,7 +64,6 @@ class LinodeTest(integration.ShellCase):
)
)
@expensiveTest
def test_instance(self):
'''
Test creating an instance on Linode