saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Appease the pylint gods.

Browse source
This commit is contained in:
Thayne Harbaugh 2016-07-28 14:50:53 -06:00
parent 7082d91379
commit c37bafaca1
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/integration/shell/master.py
View file

@ -86,7 +86,7 @@ class MasterTest(integration.ShellCase, testprogram.TestProgramCase, integration
master = testprogram.TestDaemonSaltMaster(
name='unknown_user',
configs={'master':{'map':{'user': 'unknown'}}},
configs={'master': {'map': {'user': 'unknown'}}},
parent_dir=self._test_dir,
)
# Call setup here to ensure config and script exist

12
tests/integration/shell/minion.py
View file

@ -167,11 +167,11 @@ class MinionTest(integration.ShellCase, testprogram.TestProgramCase, integration
parent_dir=self._test_dir,
pid_file=pid_file,
configs={
'minion':{
'map':{
'pidfile':os.path.join('var', 'run', pid_file),
'sock_dir':os.path.join('var', 'run', 'salt', mname),
'log_file':os.path.join('var', 'log', 'salt', mname),
'minion': {
'map': {
'pidfile': os.path.join('var', 'run', pid_file),
'sock_dir': os.path.join('var', 'run', 'salt', mname),
'log_file': os.path.join('var', 'log', 'salt', mname),
},
},
},
@ -273,7 +273,7 @@ class MinionTest(integration.ShellCase, testprogram.TestProgramCase, integration
minion = testprogram.TestDaemonSaltMinion(
name='unknown_user',
configs={'minion':{'map':{'user': 'unknown'}}},
configs={'minion': {'map': {'user': 'unknown'}}},
parent_dir=self._test_dir,
)
# Call setup here to ensure config and script exist

2
tests/integration/shell/proxy.py
View file

@ -57,7 +57,7 @@ class ProxyTest(testprogram.TestProgramCase):
proxy = testprogram.TestDaemonSaltProxy(
name='proxy-unknown_user',
configs={'minion':{'map':{'user': 'unknown'}}},
configs={'minion': {'map': {'user': 'unknown'}}},
parent_dir=self._test_dir,
)
# Call setup here to ensure config and script exist

16
tests/integration/utils/testprogram.py
View file

@ -669,20 +669,20 @@ class TestSaltProgram(six.with_metaclass(TestSaltProgramMeta, TestProgram)):
class TestProgramSalt(TestSaltProgram):
'''Class to manage salt'''
configs = {'master':{}}
configs = {'master': {}}
script = 'salt'
class TestProgramSaltCall(TestSaltProgram):
'''Class to manage salt-call'''
configs = {'minion':{'map':{'id':'{name}'}}}
configs = {'minion': {'map': {'id': '{name}'}}}
class TestProgramSaltRun(TestSaltProgram):
'''Class to manage salt-run'''
configs = {'master':{}}
configs = {'master': {}}
def __init__(self, *args, **kwargs):
cfgb = kwargs.setdefault('config_base', {})
@ -799,7 +799,7 @@ class TestDaemonSaltMaster(TestSaltDaemon):
Manager for salt-master daemon.
'''
configs = {'master':{}}
configs = {'master': {}}
def __init__(self, *args, **kwargs):
cfgb = kwargs.setdefault('config_base', {})
@ -812,7 +812,7 @@ class TestDaemonSaltMinion(TestSaltDaemon):
Manager for salt-minion daemon.
'''
configs = {'minion':{'map':{'id':'{name}'}}}
configs = {'minion': {'map': {'id': '{name}'}}}
def __init__(self, *args, **kwargs):
cfgb = kwargs.setdefault('config_base', {})
@ -833,8 +833,8 @@ class TestDaemonSaltSyndic(TestSaltDaemon):
'''
configs = {
'master':{'map':{'syndic_master':'localhost',},},
'minion':{'map':{'id':'{name}',},},
'master': {'map': {'syndic_master': 'localhost'}},
'minion': {'map': {'id': '{name}'}},
}
def __init__(self, *args, **kwargs):
@ -849,7 +849,7 @@ class TestDaemonSaltProxy(TestSaltDaemon):
'''
pid_file = 'salt-minion.pid'
configs = {'proxy':{}}
configs = {'proxy': {}}
def __init__(self, *args, **kwargs):
cfgb = kwargs.setdefault('config_base', {})