Merge "Fix error with image show when image name is None"

This commit is contained in:
Zuul 2018-07-24 21:45:26 +00:00 committed by Gerrit Code Review
commit c42b8552a8
4 changed files with 5 additions and 4 deletions

View File

@ -54,7 +54,7 @@ openstacksdk==0.11.2
os-client-config==1.28.0
os-service-types==1.2.0
os-testr==1.0.0
osc-lib==1.8.0
osc-lib==1.10.0
oslo.concurrency==3.26.0
oslo.config==5.2.0
oslo.context==2.19.2

View File

@ -585,7 +585,7 @@ class ListImage(command.Lister):
property_field='properties',
)
data = utils.sort_items(data, parsed_args.sort)
data = utils.sort_items(data, parsed_args.sort, str)
return (
column_headers,

View File

@ -708,7 +708,8 @@ class TestImageList(TestImage):
)
si_mock.assert_called_with(
[self._image],
'name:asc'
'name:asc',
str,
)
self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, tuple(data))

View File

@ -8,7 +8,7 @@ Babel!=2.4.0,>=2.3.4 # BSD
cliff!=2.9.0,>=2.8.0 # Apache-2.0
keystoneauth1>=3.4.0 # Apache-2.0
openstacksdk>=0.11.2 # Apache-2.0
osc-lib>=1.8.0 # Apache-2.0
osc-lib>=1.10.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
python-glanceclient>=2.8.0 # Apache-2.0