mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix PyLint C0322 and C0324 - Spaces around opertor and commas
This commit is contained in:
Pedro Algarvio
parent
eea0001942
commit
f2e3a4aebe
3 changed files with 86 additions and 86 deletions
|
|
@ -369,7 +369,7 @@ fi
|
|||
'''
|
||||
Call sls file containing several requisites.
|
||||
'''
|
||||
expected_simple_result={
|
||||
expected_simple_result = {
|
||||
'cmd_|-A_|-echo A_|-run': {
|
||||
'__run_num__': 2,
|
||||
'comment': 'Command "echo A" run',
|
||||
|
|
@ -383,7 +383,7 @@ fi
|
|||
'comment': 'Command "echo C" run',
|
||||
'result': True}
|
||||
}
|
||||
expected_result={
|
||||
expected_result = {
|
||||
'cmd_|-A_|-echo A fifth_|-run': {
|
||||
'__run_num__': 4,
|
||||
'comment': 'Command "echo A fifth" run',
|
||||
|
|
@ -405,7 +405,7 @@ fi
|
|||
'comment': 'Command "echo E fourth" run',
|
||||
'result': True}
|
||||
}
|
||||
expected_req_use_result={
|
||||
expected_req_use_result = {
|
||||
'cmd_|-A_|-echo A_|-run': {
|
||||
'__run_num__': 1,
|
||||
'comment': 'Command "echo A" run',
|
||||
|
|
@ -431,13 +431,13 @@ fi
|
|||
'comment': 'Command "echo F" run',
|
||||
'result': True}
|
||||
}
|
||||
result={}
|
||||
result = {}
|
||||
ret = self.run_function('state.sls', mods='requisites.mixed_simple')
|
||||
for item,descr in ret.iteritems():
|
||||
for item, descr in ret.iteritems():
|
||||
result[item] = {
|
||||
'__run_num__': descr['__run_num__'],
|
||||
'comment':descr['comment'],
|
||||
'result':descr['result']
|
||||
'comment': descr['comment'],
|
||||
'result': descr['result']
|
||||
}
|
||||
self.assertEqual(expected_simple_result, result)
|
||||
|
||||
|
|
@ -467,13 +467,13 @@ fi
|
|||
|
||||
# undetected infinite loopS prevents this test from running...
|
||||
# TODO: this is actually failing badly
|
||||
#result={}
|
||||
#result = {}
|
||||
#ret = self.run_function('state.sls', mods='requisites.mixed_complex1')
|
||||
#for item,descr in ret.iteritems():
|
||||
#for item, descr in ret.iteritems():
|
||||
# result[item] = {
|
||||
# '__run_num__': descr['__run_num__'],
|
||||
# 'comment':descr['comment'],
|
||||
# 'result':descr['result']
|
||||
# 'comment': descr['comment'],
|
||||
# 'result': descr['result']
|
||||
# }
|
||||
#self.assertEqual(expected_result, result)
|
||||
|
||||
|
|
@ -483,7 +483,7 @@ fi
|
|||
|
||||
Ensure that some of them are failing and that the order is right.
|
||||
'''
|
||||
expected_result={
|
||||
expected_result = {
|
||||
'cmd_|-A_|-echo A fifth_|-run': {
|
||||
'__run_num__': 4,
|
||||
'comment': 'Command "echo A fifth" run',
|
||||
|
|
@ -523,13 +523,13 @@ fi
|
|||
+ ' cmd: Z\n',
|
||||
'result': False}
|
||||
}
|
||||
result={}
|
||||
result = {}
|
||||
ret = self.run_function('state.sls', mods='requisites.require')
|
||||
for item,descr in ret.iteritems():
|
||||
for item, descr in ret.iteritems():
|
||||
result[item] = {
|
||||
'__run_num__': descr['__run_num__'],
|
||||
'comment':descr['comment'],
|
||||
'result':descr['result']
|
||||
'comment': descr['comment'],
|
||||
'result': descr['result']
|
||||
}
|
||||
self.assertEqual(expected_result, result)
|
||||
|
||||
|
|
@ -543,7 +543,7 @@ fi
|
|||
# FIXME: Why is require enforcing list syntax while require_in does not?
|
||||
# And why preventing it?
|
||||
# Currently this state fails, should return C/B/A
|
||||
result={}
|
||||
result = {}
|
||||
ret = self.run_function('state.sls', mods='requisites.require_simple_nolist')
|
||||
self.assertEqual(ret, [
|
||||
'The require or watch statement in state "B" in sls '
|
||||
|
|
@ -568,7 +568,7 @@ fi
|
|||
'''
|
||||
Teste the sls special command in requisites
|
||||
'''
|
||||
expected_result={
|
||||
expected_result = {
|
||||
'cmd_|-A_|-echo A_|-run': {
|
||||
'__run_num__': 2,
|
||||
'comment': 'Command "echo A" run',
|
||||
|
|
@ -582,13 +582,13 @@ fi
|
|||
'comment': 'Command "echo C" run',
|
||||
'result': True},
|
||||
}
|
||||
result={}
|
||||
result = {}
|
||||
ret = self.run_function('state.sls', mods='requisites.fullsls_require')
|
||||
for item,descr in ret.iteritems():
|
||||
for item, descr in ret.iteritems():
|
||||
result[item] = {
|
||||
'__run_num__': descr['__run_num__'],
|
||||
'comment':descr['comment'],
|
||||
'result':descr['result']
|
||||
'comment': descr['comment'],
|
||||
'result': descr['result']
|
||||
}
|
||||
self.assertEqual(expected_result, result)
|
||||
|
||||
|
|
@ -607,7 +607,7 @@ fi
|
|||
|
||||
Ensure that some of them are failing and that the order is right.
|
||||
'''
|
||||
expected_result_simple={
|
||||
expected_result_simple = {
|
||||
'cmd_|-A_|-echo A third_|-run': {
|
||||
'__run_num__': 2,
|
||||
'comment': 'Command "echo A third" run',
|
||||
|
|
@ -633,7 +633,7 @@ fi
|
|||
+ ' foobar: A\n',
|
||||
'result': False}
|
||||
}
|
||||
expected_result_simple2={
|
||||
expected_result_simple2 = {
|
||||
'cmd_|-A_|-echo A_|-run': {
|
||||
'__run_num__': 1,
|
||||
'comment': 'Command "echo A" run',
|
||||
|
|
@ -655,7 +655,7 @@ fi
|
|||
'comment': 'Command "echo E" run',
|
||||
'result': True}
|
||||
}
|
||||
expected_result_complex={
|
||||
expected_result_complex = {
|
||||
'cmd_|-A_|-echo A fourth_|-run': {
|
||||
'__run_num__': 3,
|
||||
'comment': 'Command "echo A fourth" run',
|
||||
|
|
@ -673,13 +673,13 @@ fi
|
|||
'comment': 'Command "echo D third" run',
|
||||
'result': True},
|
||||
}
|
||||
result={}
|
||||
result = {}
|
||||
ret = self.run_function('state.sls', mods='requisites.prereq_simple')
|
||||
for item,descr in ret.iteritems():
|
||||
for item, descr in ret.iteritems():
|
||||
result[item] = {
|
||||
'__run_num__': descr['__run_num__'],
|
||||
'comment':descr['comment'],
|
||||
'result':descr['result']
|
||||
'comment': descr['comment'],
|
||||
'result': descr['result']
|
||||
}
|
||||
self.assertEqual(expected_result_simple, result)
|
||||
|
||||
|
|
@ -687,25 +687,25 @@ fi
|
|||
# TODO: issue #8235, prereq ignored when not used in list syntax
|
||||
# Currently fails badly with :
|
||||
# TypeError encountered executing state.sls: string indices must be integers, not str.
|
||||
#result={}
|
||||
#result = {}
|
||||
#expected_result_simple.pop('cmd_|-I_|-echo I_|-run')
|
||||
#expected_result_simple.pop('cmd_|-J_|-echo J_|-run')
|
||||
#ret = self.run_function('state.sls', mods='requisites.prereq_simple_nolist')
|
||||
#for item,descr in ret.iteritems():
|
||||
#for item, descr in ret.iteritems():
|
||||
# result[item] = {
|
||||
# '__run_num__': descr['__run_num__'],
|
||||
# 'comment':descr['comment'],
|
||||
# 'result':descr['result']
|
||||
# 'comment': descr['comment'],
|
||||
# 'result': descr['result']
|
||||
# }
|
||||
#self.assertEqual(expected_result_simple, result)
|
||||
|
||||
result={}
|
||||
result = {}
|
||||
ret = self.run_function('state.sls', mods='requisites.prereq_simple2')
|
||||
for item,descr in ret.iteritems():
|
||||
for item, descr in ret.iteritems():
|
||||
result[item] = {
|
||||
'__run_num__': descr['__run_num__'],
|
||||
'comment':descr['comment'],
|
||||
'result':descr['result']
|
||||
'comment': descr['comment'],
|
||||
'result': descr['result']
|
||||
}
|
||||
self.assertEqual(expected_result_simple2, result)
|
||||
|
||||
|
|
@ -734,13 +734,13 @@ fi
|
|||
|
||||
# issue #8211, chaining complex prereq & prereq_in
|
||||
# TODO: Actually this test fails
|
||||
#result={}
|
||||
#result = {}
|
||||
#ret = self.run_function('state.sls', mods='requisites.prereq_complex')
|
||||
#for item,descr in ret.iteritems():
|
||||
#for item, descr in ret.iteritems():
|
||||
# result[item] = {
|
||||
# '__run_num__': descr['__run_num__'],
|
||||
# 'comment':descr['comment'],
|
||||
# 'result':descr['result']
|
||||
# 'comment': descr['comment'],
|
||||
# 'result': descr['result']
|
||||
# }
|
||||
#self.assertEqual(expected_result_complex, result)
|
||||
|
||||
|
|
@ -759,7 +759,7 @@ fi
|
|||
'''
|
||||
# TODO issue #8235 & #8774 some examples are still commented in the test file
|
||||
ret = self.run_function('state.sls', mods='requisites.use')
|
||||
for item,descr in ret.iteritems():
|
||||
for item, descr in ret.iteritems():
|
||||
self.assertEqual(descr['comment'], 'onlyif execution failed')
|
||||
|
||||
# TODO: issue #8802 : use recursions undetected
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ class FileBlockReplaceTestCase(TestCase):
|
|||
''')
|
||||
|
||||
def setUp(self):
|
||||
self.tfile = tempfile.NamedTemporaryFile(delete=False,prefix='blockrepltmp')
|
||||
self.tfile = tempfile.NamedTemporaryFile(delete=False, prefix='blockrepltmp')
|
||||
self.tfile.write(self.MULTILINE_STRING)
|
||||
self.tfile.close()
|
||||
manage_mode_mock = MagicMock()
|
||||
|
|
@ -150,7 +150,7 @@ class FileBlockReplaceTestCase(TestCase):
|
|||
filemod.blockreplace(self.tfile.name, '#-- START BLOCK 1', '#-- END BLOCK 1', new_multiline_content, backup=False)
|
||||
|
||||
with open(self.tfile.name, 'rb') as fp:
|
||||
filecontent=fp.read()
|
||||
filecontent = fp.read()
|
||||
self.assertIn('#-- START BLOCK 1'+"\n"+new_multiline_content+"\n"+'#-- END BLOCK 1', filecontent)
|
||||
self.assertNotIn('old content part 1', filecontent)
|
||||
self.assertNotIn('old content part 2', filecontent)
|
||||
|
|
@ -171,7 +171,7 @@ class FileBlockReplaceTestCase(TestCase):
|
|||
with open(self.tfile.name, 'rb') as fp:
|
||||
self.assertNotIn('#-- START BLOCK 2'+"\n"+new_content+"\n"+'#-- END BLOCK 2', fp.read())
|
||||
|
||||
filemod.blockreplace(self.tfile.name, '#-- START BLOCK 2', '#-- END BLOCK 2', new_content, backup=False,append_if_not_found=True)
|
||||
filemod.blockreplace(self.tfile.name, '#-- START BLOCK 2', '#-- END BLOCK 2', new_content, backup=False, append_if_not_found=True)
|
||||
|
||||
with open(self.tfile.name, 'rb') as fp:
|
||||
self.assertIn('#-- START BLOCK 2'+"\n"+new_content+"\n"+'#-- END BLOCK 2', fp.read())
|
||||
|
|
@ -192,7 +192,7 @@ class FileBlockReplaceTestCase(TestCase):
|
|||
with open(self.tfile.name, 'rb') as fp:
|
||||
self.assertNotIn('#-- START BLOCK 2'+"\n"+new_content+"\n"+'#-- END BLOCK 2', fp.read())
|
||||
|
||||
filemod.blockreplace(self.tfile.name, '#-- START BLOCK 2', '#-- END BLOCK 2', new_content, backup=False,prepend_if_not_found=True)
|
||||
filemod.blockreplace(self.tfile.name, '#-- START BLOCK 2', '#-- END BLOCK 2', new_content, backup=False, prepend_if_not_found=True)
|
||||
|
||||
with open(self.tfile.name, 'rb') as fp:
|
||||
self.assertTrue(fp.read().startswith('#-- START BLOCK 2'+"\n"+new_content+"\n"+'#-- END BLOCK 2'))
|
||||
|
|
@ -201,7 +201,7 @@ class FileBlockReplaceTestCase(TestCase):
|
|||
filemod.blockreplace(self.tfile.name, '// START BLOCK', '// END BLOCK', 'new content 1', backup=False)
|
||||
|
||||
with open(self.tfile.name, 'rb') as fp:
|
||||
filecontent=fp.read()
|
||||
filecontent = fp.read()
|
||||
self.assertIn('new content 1', filecontent)
|
||||
self.assertNotIn('to be removed', filecontent)
|
||||
self.assertIn('first part of start line', filecontent)
|
||||
|
|
|
|||
|
|
@ -18,34 +18,34 @@ grainsmod.__grains__ = {
|
|||
class GrainsModuleTestCase(TestCase):
|
||||
|
||||
def test_filter_by(self):
|
||||
dict1={'A': 'B', 'C': {'D': {'E': 'F','G': 'H'}}}
|
||||
mdict={'D': {'E': 'I'},'J': 'K'}
|
||||
dict1 = {'A': 'B', 'C': {'D': {'E': 'F', 'G': 'H'}}}
|
||||
mdict = {'D': {'E': 'I'}, 'J': 'K'}
|
||||
|
||||
# test None result with non existent grain and no default
|
||||
res=grainsmod.filter_by(dict1, grain='xxx')
|
||||
self.assertIs(res,None)
|
||||
res = grainsmod.filter_by(dict1, grain='xxx')
|
||||
self.assertIs(res, None)
|
||||
|
||||
# test None result with os_family grain and no matching result
|
||||
res=grainsmod.filter_by(dict1)
|
||||
self.assertIs(res,None)
|
||||
res = grainsmod.filter_by(dict1)
|
||||
self.assertIs(res, None)
|
||||
|
||||
# test with non existent grain, and a given default key
|
||||
res=grainsmod.filter_by(dict1, grain='xxx', default='C')
|
||||
self.assertEqual(res,{'D': {'E': 'F','G': 'H'}})
|
||||
res = grainsmod.filter_by(dict1, grain='xxx', default='C')
|
||||
self.assertEqual(res, {'D': {'E': 'F', 'G': 'H'}})
|
||||
|
||||
# add a merge dictionnary, F disapears
|
||||
res=grainsmod.filter_by(dict1, grain='xxx', merge=mdict, default='C')
|
||||
self.assertEqual(res,{'D': {'E': 'I','G': 'H'},'J': 'K'})
|
||||
res = grainsmod.filter_by(dict1, grain='xxx', merge=mdict, default='C')
|
||||
self.assertEqual(res, {'D': {'E': 'I', 'G': 'H'}, 'J': 'K'})
|
||||
# dict1 was altered, restablish
|
||||
dict1={'A': 'B', 'C': {'D': {'E': 'F','G': 'H'}}}
|
||||
dict1 = {'A': 'B', 'C': {'D': {'E': 'F', 'G': 'H'}}}
|
||||
|
||||
# default is not present in dict1, check we only have merge in result
|
||||
res=grainsmod.filter_by(dict1, grain='xxx', merge=mdict, default='Z')
|
||||
self.assertEqual(res,mdict)
|
||||
res = grainsmod.filter_by(dict1, grain='xxx', merge=mdict, default='Z')
|
||||
self.assertEqual(res, mdict)
|
||||
|
||||
# default is not present in dict1, and no merge, should get None
|
||||
res=grainsmod.filter_by(dict1, grain='xxx', default='Z')
|
||||
self.assertIs(res,None)
|
||||
res = grainsmod.filter_by(dict1, grain='xxx', default='Z')
|
||||
self.assertIs(res, None)
|
||||
|
||||
#test giving a list as merge argument raise exception
|
||||
self.assertRaises(
|
||||
|
|
@ -58,18 +58,18 @@ class GrainsModuleTestCase(TestCase):
|
|||
)
|
||||
|
||||
#Now, re-test with an existing grain (os_family), but with no match.
|
||||
res=grainsmod.filter_by(dict1)
|
||||
self.assertIs(res,None)
|
||||
res=grainsmod.filter_by(dict1, default='C')
|
||||
self.assertEqual(res,{'D': {'E': 'F','G': 'H'}})
|
||||
res=grainsmod.filter_by(dict1, merge=mdict, default='C')
|
||||
self.assertEqual(res,{'D': {'E': 'I','G': 'H'},'J': 'K'})
|
||||
res = grainsmod.filter_by(dict1)
|
||||
self.assertIs(res, None)
|
||||
res = grainsmod.filter_by(dict1, default='C')
|
||||
self.assertEqual(res, {'D': {'E': 'F', 'G': 'H'}})
|
||||
res = grainsmod.filter_by(dict1, merge=mdict, default='C')
|
||||
self.assertEqual(res, {'D': {'E': 'I', 'G': 'H'}, 'J': 'K'})
|
||||
# dict1 was altered, restablish
|
||||
dict1={'A': 'B', 'C': {'D': {'E': 'F','G': 'H'}}}
|
||||
res=grainsmod.filter_by(dict1, merge=mdict, default='Z')
|
||||
self.assertEqual(res,mdict)
|
||||
res=grainsmod.filter_by(dict1, default='Z')
|
||||
self.assertIs(res,None)
|
||||
dict1 = {'A': 'B', 'C': {'D': {'E': 'F', 'G': 'H'}}}
|
||||
res = grainsmod.filter_by(dict1, merge=mdict, default='Z')
|
||||
self.assertEqual(res, mdict)
|
||||
res = grainsmod.filter_by(dict1, default='Z')
|
||||
self.assertIs(res, None)
|
||||
# this one is in fact a traceback in updatedict, merging a string with a dictionnary
|
||||
self.assertRaises(
|
||||
TypeError,
|
||||
|
|
@ -80,21 +80,21 @@ class GrainsModuleTestCase(TestCase):
|
|||
)
|
||||
|
||||
#Now, re-test with a matching grain.
|
||||
dict1={'A': 'B', 'MockedOS': {'D': {'E': 'F','G': 'H'}}}
|
||||
res=grainsmod.filter_by(dict1)
|
||||
self.assertEqual(res,{'D': {'E': 'F','G': 'H'}})
|
||||
res=grainsmod.filter_by(dict1, default='A')
|
||||
self.assertEqual(res,{'D': {'E': 'F','G': 'H'}})
|
||||
res=grainsmod.filter_by(dict1, merge=mdict, default='A')
|
||||
self.assertEqual(res,{'D': {'E': 'I','G': 'H'},'J': 'K'})
|
||||
dict1 = {'A': 'B', 'MockedOS': {'D': {'E': 'F', 'G': 'H'}}}
|
||||
res = grainsmod.filter_by(dict1)
|
||||
self.assertEqual(res, {'D': {'E': 'F', 'G': 'H'}})
|
||||
res = grainsmod.filter_by(dict1, default='A')
|
||||
self.assertEqual(res, {'D': {'E': 'F', 'G': 'H'}})
|
||||
res = grainsmod.filter_by(dict1, merge=mdict, default='A')
|
||||
self.assertEqual(res, {'D': {'E': 'I', 'G': 'H'}, 'J': 'K'})
|
||||
# dict1 was altered, restablish
|
||||
dict1={'A': 'B', 'MockedOS': {'D': {'E': 'F','G': 'H'}}}
|
||||
res=grainsmod.filter_by(dict1, merge=mdict, default='Z')
|
||||
self.assertEqual(res,{'D': {'E': 'I', 'G': 'H'},'J': 'K'})
|
||||
dict1 = {'A': 'B', 'MockedOS': {'D': {'E': 'F', 'G': 'H'}}}
|
||||
res = grainsmod.filter_by(dict1, merge=mdict, default='Z')
|
||||
self.assertEqual(res, {'D': {'E': 'I', 'G': 'H'}, 'J': 'K'})
|
||||
# dict1 was altered, restablish
|
||||
dict1={'A': 'B', 'MockedOS': {'D': {'E': 'F','G': 'H'}}}
|
||||
res=grainsmod.filter_by(dict1, default='Z')
|
||||
self.assertEqual(res,{'D': {'E': 'F','G': 'H'}})
|
||||
dict1 = {'A': 'B', 'MockedOS': {'D': {'E': 'F', 'G': 'H'}}}
|
||||
res = grainsmod.filter_by(dict1, default='Z')
|
||||
self.assertEqual(res, {'D': {'E': 'F', 'G': 'H'}})
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue