openstack/python-openstackclient
Code Issues Proposed changes

Merge "Refactor TestImageList with FakeImage class"

Browse Source
This commit is contained in:
Jenkins 2016-05-16 22:46:09 +00:00 committed by Gerrit Code Review
commit 22e738c751
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openstackclient/tests/image/v2/test_image.py
View File

@ -20,6 +20,7 @@ import warlock
from glanceclient.v2 import schemas from glanceclient.v2 import schemas
from openstackclient.common import exceptions from openstackclient.common import exceptions
from openstackclient.common import utils as common_utils
from openstackclient.image.v2 import image from openstackclient.image.v2 import image
from openstackclient.tests import fakes from openstackclient.tests import fakes
from openstackclient.tests.identity.v3 import fakes as identity_fakes from openstackclient.tests.identity.v3 import fakes as identity_fakes
@ -472,25 +473,26 @@ class TestImageDelete(TestImage):
class TestImageList(TestImage): class TestImageList(TestImage):
_image = image_fakes.FakeImage.create_one_image()
columns = ( columns = (
'ID', 'ID',
'Name', 'Name',
'Status', 'Status',
) )
datalist = ( datalist = (
( _image.id,
image_fakes.image_id, _image.name,
image_fakes.image_name, '',
'', ),
),
)
def setUp(self): def setUp(self):
super(TestImageList, self).setUp() super(TestImageList, self).setUp()
self.api_mock = mock.Mock() self.api_mock = mock.Mock()
self.api_mock.image_list.side_effect = [ self.api_mock.image_list.side_effect = [
[copy.deepcopy(image_fakes.IMAGE)], [], [image_fakes.FakeImage.get_image_info(self._image)], [],
] ]
self.app.client_manager.image.api = self.api_mock self.app.client_manager.image.api = self.api_mock
@ -615,23 +617,24 @@ class TestImageList(TestImage):
self.assertEqual(collist, columns) self.assertEqual(collist, columns)
datalist = (( datalist = ((
image_fakes.image_id, self._image.id,
image_fakes.image_name, self._image.name,
'', '',
'', '',
'', '',
'', '',
'public', self._image.visibility,
False, self._image.protected,
image_fakes.image_owner, self._image.owner,
'', common_utils.format_list(self._image.tags),
), ) ), )
self.assertEqual(datalist, tuple(data)) self.assertEqual(datalist, tuple(data))
@mock.patch('openstackclient.api.utils.simple_filter') @mock.patch('openstackclient.api.utils.simple_filter')
def test_image_list_property_option(self, sf_mock): def test_image_list_property_option(self, sf_mock):
sf_mock.return_value = [ sf_mock.return_value = [
copy.deepcopy(image_fakes.IMAGE), copy.deepcopy(
image_fakes.FakeImage.get_image_info(self._image)),
] ]
arglist = [ arglist = [
@ -648,7 +651,7 @@ class TestImageList(TestImage):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.api_mock.image_list.assert_called_with() self.api_mock.image_list.assert_called_with()
sf_mock.assert_called_with( sf_mock.assert_called_with(
[image_fakes.IMAGE], [image_fakes.FakeImage.get_image_info(self._image)],
attr='a', attr='a',
value='1', value='1',
property_field='properties', property_field='properties',
@ -660,7 +663,8 @@ class TestImageList(TestImage):
@mock.patch('openstackclient.common.utils.sort_items') @mock.patch('openstackclient.common.utils.sort_items')
def test_image_list_sort_option(self, si_mock): def test_image_list_sort_option(self, si_mock):
si_mock.return_value = [ si_mock.return_value = [
copy.deepcopy(image_fakes.IMAGE) copy.deepcopy(
image_fakes.FakeImage.get_image_info(self._image))
] ]
arglist = ['--sort', 'name:asc'] arglist = ['--sort', 'name:asc']
@ -673,10 +677,9 @@ class TestImageList(TestImage):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.api_mock.image_list.assert_called_with() self.api_mock.image_list.assert_called_with()
si_mock.assert_called_with( si_mock.assert_called_with(
[image_fakes.IMAGE], [image_fakes.FakeImage.get_image_info(self._image)],
'name:asc' 'name:asc'
) )
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, tuple(data)) self.assertEqual(self.datalist, tuple(data))