mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix pylint on 2017.7.9
This commit is contained in:
parent
036bf686c0
commit
4945e35085
9 changed files with 8 additions and 1 deletions
|
@ -33,6 +33,7 @@ class EC2Test(ShellCase):
|
|||
'''
|
||||
Integration tests for the EC2 cloud provider in Salt-Cloud
|
||||
'''
|
||||
|
||||
def _installer_name(self):
|
||||
'''
|
||||
Determine the downloaded installer name by searching the files
|
||||
|
|
|
@ -16,6 +16,7 @@ from tests.support.unit import skipIf
|
|||
# Import Salt Libs
|
||||
from salt.config import cloud_providers_config
|
||||
|
||||
|
||||
# Create the cloud instance name to be used throughout the tests
|
||||
INSTANCE_NAME = generate_random_name('CLOUD-TEST-')
|
||||
PROVIDER_NAME = 'gogrid'
|
||||
|
|
|
@ -15,7 +15,6 @@ from tests.support.helpers import expensiveTest, generate_random_name
|
|||
# Import Salt Libs
|
||||
from salt.config import cloud_providers_config
|
||||
|
||||
|
||||
# Create the cloud instance name to be used throughout the tests
|
||||
INSTANCE_NAME = generate_random_name('CLOUD-TEST-')
|
||||
PROVIDER_NAME = 'joyent'
|
||||
|
|
|
@ -15,6 +15,7 @@ from tests.support.helpers import expensiveTest, generate_random_name
|
|||
# Import Salt Libs
|
||||
from salt.config import cloud_providers_config
|
||||
|
||||
|
||||
# Create the cloud instance name to be used throughout the tests
|
||||
INSTANCE_NAME = generate_random_name('CLOUD-TEST-')
|
||||
PROVIDER_NAME = 'linode'
|
||||
|
|
|
@ -23,6 +23,7 @@ try:
|
|||
except ImportError:
|
||||
HAS_ONEANDONE = False
|
||||
|
||||
|
||||
# Create the cloud instance name to be used throughout the tests
|
||||
INSTANCE_NAME = generate_random_name('CLOUD-TEST-')
|
||||
PROVIDER_NAME = 'oneandone'
|
||||
|
|
|
@ -16,6 +16,7 @@ from tests.support.case import ShellCase
|
|||
from tests.support.paths import FILES
|
||||
from tests.support.helpers import expensiveTest, generate_random_name
|
||||
|
||||
|
||||
# Create the cloud instance name to be used throughout the tests
|
||||
INSTANCE_NAME = generate_random_name('CLOUD-TEST-')
|
||||
PROVIDER_NAME = 'vmware'
|
||||
|
|
|
@ -18,6 +18,7 @@ from tests.support.unit import skipIf
|
|||
from salt.config import cloud_providers_config
|
||||
from salt.ext import six
|
||||
|
||||
|
||||
# Create the cloud instance name to be used throughout the tests
|
||||
INSTANCE_NAME = generate_random_name('CLOUD-TEST-')
|
||||
PROVIDER_NAME = 'vultr'
|
||||
|
|
|
@ -188,6 +188,7 @@ class RuntimeVars(object):
|
|||
|
||||
# <---- Helper Methods -----------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
# ----- Global Variables -------------------------------------------------------------------------------------------->
|
||||
XML_OUTPUT_DIR = os.environ.get('SALT_XML_TEST_REPORTS_DIR', os.path.join(paths.TMP, 'xml-test-reports'))
|
||||
# <---- Global Variables ---------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -1076,5 +1076,6 @@ class DaemonMixInTestCase(TestCase):
|
|||
salt.utils.parsers.logger.debug.assert_not_called()
|
||||
|
||||
|
||||
|
||||
# Hide the class from unittest framework when it searches for TestCase classes in the module
|
||||
del LogSettingsParserTests
|
||||
|
|
Loading…
Add table
Reference in a new issue