Fix incorrect output for 'fuel2 node list'

Change-Id: Ic5ca3882c54a4dccda0d5b318174555a5fb891ab
Closes-Bug: #1471852
This commit is contained in:
Alexander Gubanov
2015-07-07 11:21:48 +03:00
parent 018c53561b
commit 687033e275
2 changed files with 10 additions and 0 deletions

View File

@@ -37,6 +37,9 @@ def get_display_data_single(fields, data):
if not val and val not in (0, None, False, ''):
val = '-'
if isinstance(val, list):
val = ', '.join(str(item) for item in val)
result.append(val)
return result

View File

@@ -199,6 +199,13 @@ class TestUtils(base.UnitTestCase):
result = data_utils.get_display_data_single(fields, test_data)
self.assertEqual([1, '-', '-'], result)
def test_get_display_data_single_list_val(self):
test_data = {'a': 1, 'b': ['2'], 'c': ['3', '4']}
fields = ('a', 'b', 'c')
result = data_utils.get_display_data_single(fields, test_data)
self.assertEqual([1, '2', '3, 4'], result)
def test_get_display_data_bad_key(self):
test_data = {'a': 1, 'b': 2, 'c': 3}
fields = ('b', 'bad_key')