openstack
/
tripleo-operator-ansible
Code Issues Proposed changes

Merge "Ensure we don't pass empty params"

This commit is contained in:
Zuul 2020-04-09 14:47:32 +00:00 committed by Gerrit Code Review
parent 8d293c17f3 3bda80918d
commit 9b4c8bf98a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/filter/shell_args.py
View File

@ -34,9 +34,10 @@ class FilterModule(object):
arg = [arg]
return_value = []
for a in arg:
val = quote(a)
if parameter:
return_value.append("{} {}".format(parameter, val))
else:
return_value.append(val)
if a:
val = quote(a)
if parameter:
return_value.append("{} {}".format(parameter, val))
else:
return_value.append(val)
return ' '.join(return_value)

6
tests/plugins/filter/test_shell_args.py
View File

@ -53,3 +53,9 @@ class TestShellArgsFilters(tests_base.TestCase):
expected = "'a b'"
self.assertEqual(expected,
self.filter.shell_arg_list(arg))
def test_shell_arg_list_avoid_none_in_list(self):
arg = ['a', None]
expected = '-p a'
self.assertEqual(expected,
self.filter.shell_arg_list(arg, parameter='-p'))