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

Appease the pylint gods: lambdas

Browse Source
This commit is contained in:
Thayne Harbaugh 2016-07-28 15:20:25 -06:00
parent c37bafaca1
commit 8a700b54f8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/utils/testprogram.py
View File

@ -88,12 +88,15 @@ class TestProgram(six.with_metaclass(TestProgramMeta, object)):
config_dir = os.path.join('etc')
configs = {}
config_types = (str, six.string_types,)
config_caster = lambda x: str(x)
dirtree = [
'&config_dirs',
]
@staticmethod
def config_caster(cfg):
return str(cfg)
def __init__(self, program=None, name=None, env=None, shell=False, parent_dir=None, clean_on_exit=True, **kwargs):
self.program = program or getattr(self, 'program', None)
self.name = name or getattr(self, 'name', None)
@ -568,7 +571,6 @@ class TestSaltProgram(six.with_metaclass(TestSaltProgramMeta, TestProgram)):
auxiliary program.
'''
config_types = (dict,)
config_caster = lambda x: yaml.safe_load(x)
config_attrs = set([
'log_dir',
'script_dir',
@ -589,6 +591,10 @@ class TestSaltProgram(six.with_metaclass(TestSaltProgramMeta, TestProgram)):
script = ''
script_dir = 'bin'
@staticmethod
def config_caster(cfg):
return yaml.safe_load(cfg)
def __init__(self, *args, **kwargs):
if len(args) < 2 and 'program' not in kwargs:
# This is effectively a place-holder - it gets set correctly after super()