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

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

Browse Source
This commit is contained in:
Pedro Algarvio 2014-06-23 00:58:39 +01:00
parent 8747261f47
commit 992cdc07b1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/cloud/providers/linode.py
View File

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