openstack/python-openstackclient
Code Issues Proposed changes

Merge "[Image] Check return value is None in image unit tests."

Browse Source
This commit is contained in:
Jenkins 2016-03-02 17:25:19 +00:00 committed by Gerrit Code Review
commit fc8b4cfcae
2 changed files with 46 additions and 34 deletions
openstackclient/tests/image
v1
test_image.py
v2
test_image.py

26
openstackclient/tests/image/v1/test_image.py

@ -236,11 +236,10 @@ class TestImageDelete(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.images_mock.delete.assert_called_with( self.images_mock.delete.assert_called_with(image_fakes.image_id)
image_fakes.image_id, self.assertIsNone(result)
)
class TestImageList(TestImage): class TestImageList(TestImage):
@ -473,10 +472,11 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
# Verify update() was not called, if it was show the args # Verify update() was not called, if it was show the args
self.assertEqual(self.images_mock.update.call_args_list, []) self.assertEqual(self.images_mock.update.call_args_list, [])
self.assertIsNone(result)
def test_image_set_options(self): def test_image_set_options(self):
arglist = [ arglist = [
@ -501,7 +501,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'name': 'new-name', 'name': 'new-name',
@ -517,6 +517,7 @@ class TestImageSet(TestImage):
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_bools1(self): def test_image_set_bools1(self):
arglist = [ arglist = [
@ -533,7 +534,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'protected': True, 'protected': True,
@ -544,6 +545,7 @@ class TestImageSet(TestImage):
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_bools2(self): def test_image_set_bools2(self):
arglist = [ arglist = [
@ -560,7 +562,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'protected': False, 'protected': False,
@ -571,6 +573,7 @@ class TestImageSet(TestImage):
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_properties(self): def test_image_set_properties(self):
arglist = [ arglist = [
@ -584,7 +587,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'properties': { 'properties': {
@ -598,6 +601,7 @@ class TestImageSet(TestImage):
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_update_volume(self): def test_image_update_volume(self):
# Set up VolumeManager Mock # Set up VolumeManager Mock
@ -639,7 +643,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
# VolumeManager.upload_to_image(volume, force, image_name, # VolumeManager.upload_to_image(volume, force, image_name,
# container_format, disk_format) # container_format, disk_format)
@ -650,13 +654,13 @@ class TestImageSet(TestImage):
'', '',
'', '',
) )
# ImageManager.update(image_id, remove_props=, **) # ImageManager.update(image_id, remove_props=, **)
self.images_mock.update.assert_called_with( self.images_mock.update.assert_called_with(
image_fakes.image_id, image_fakes.image_id,
name='updated_image', name='updated_image',
volume='volly', volume='volly',
) )
self.assertIsNone(result)
class TestImageShow(TestImage): class TestImageShow(TestImage):

54
openstackclient/tests/image/v2/test_image.py

@ -445,11 +445,10 @@ class TestImageDelete(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.images_mock.delete.assert_called_with( self.images_mock.delete.assert_called_with(images[0].id)
images[0].id, self.assertIsNone(result)
)
def test_image_delete_multi_images(self): def test_image_delete_multi_images(self):
images = self.setup_images_mock(count=3) images = self.setup_images_mock(count=3)
@ -458,14 +457,13 @@ class TestImageDelete(TestImage):
verifylist = [ verifylist = [
('images', arglist), ('images', arglist),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
calls = [mock.call(i.id) for i in images] calls = [mock.call(i.id) for i in images]
self.images_mock.delete.assert_has_calls(calls) self.images_mock.delete.assert_has_calls(calls)
self.assertIsNone(result)
class TestImageList(TestImage): class TestImageList(TestImage):
@ -753,11 +751,13 @@ class TestRemoveProjectImage(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.image_members_mock.delete.assert_called_with( self.image_members_mock.delete.assert_called_with(
image_fakes.image_id, image_fakes.image_id,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertIsNone(result)
def test_remove_project_image_with_options(self): def test_remove_project_image_with_options(self):
arglist = [ arglist = [
@ -772,11 +772,13 @@ class TestRemoveProjectImage(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.image_members_mock.delete.assert_called_with( self.image_members_mock.delete.assert_called_with(
image_fakes.image_id, image_fakes.image_id,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertIsNone(result)
class TestImageSet(TestImage): class TestImageSet(TestImage):
@ -829,7 +831,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'name': 'new-name', 'name': 'new-name',
@ -842,6 +844,7 @@ class TestImageSet(TestImage):
# ImageManager.update(image, **kwargs) # ImageManager.update(image, **kwargs)
self.images_mock.update.assert_called_with( self.images_mock.update.assert_called_with(
image_fakes.image_id, **kwargs) image_fakes.image_id, **kwargs)
self.assertIsNone(result)
def test_image_set_with_unexist_owner(self): def test_image_set_with_unexist_owner(self):
self.project_mock.get.side_effect = exceptions.NotFound(None) self.project_mock.get.side_effect = exceptions.NotFound(None)
@ -855,7 +858,6 @@ class TestImageSet(TestImage):
('owner', 'unexist_owner'), ('owner', 'unexist_owner'),
('image', image_fakes.image_id), ('image', image_fakes.image_id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises( self.assertRaises(
@ -874,7 +876,6 @@ class TestImageSet(TestImage):
('project', 'unexist_owner'), ('project', 'unexist_owner'),
('image', image_fakes.image_id), ('image', image_fakes.image_id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises( self.assertRaises(
@ -896,7 +897,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'protected': True, 'protected': True,
@ -907,6 +908,7 @@ class TestImageSet(TestImage):
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_bools2(self): def test_image_set_bools2(self):
arglist = [ arglist = [
@ -923,7 +925,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'protected': False, 'protected': False,
@ -934,6 +936,7 @@ class TestImageSet(TestImage):
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_properties(self): def test_image_set_properties(self):
arglist = [ arglist = [
@ -947,7 +950,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'Alpha': '1', 'Alpha': '1',
@ -958,6 +961,7 @@ class TestImageSet(TestImage):
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_fake_properties(self): def test_image_set_fake_properties(self):
arglist = [ arglist = [
@ -980,7 +984,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'architecture': 'z80', 'architecture': 'z80',
@ -995,6 +999,7 @@ class TestImageSet(TestImage):
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_tag(self): def test_image_set_tag(self):
arglist = [ arglist = [
@ -1007,7 +1012,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'tags': ['test-tag'], 'tags': ['test-tag'],
@ -1017,6 +1022,7 @@ class TestImageSet(TestImage):
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_activate(self): def test_image_set_activate(self):
arglist = [ arglist = [
@ -1030,7 +1036,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'tags': ['test-tag'], 'tags': ['test-tag'],
@ -1039,12 +1045,12 @@ class TestImageSet(TestImage):
self.images_mock.reactivate.assert_called_with( self.images_mock.reactivate.assert_called_with(
image_fakes.image_id, image_fakes.image_id,
) )
# ImageManager.update(image, **kwargs) # ImageManager.update(image, **kwargs)
self.images_mock.update.assert_called_with( self.images_mock.update.assert_called_with(
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_deactivate(self): def test_image_set_deactivate(self):
arglist = [ arglist = [
@ -1058,7 +1064,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'tags': ['test-tag'], 'tags': ['test-tag'],
@ -1067,12 +1073,12 @@ class TestImageSet(TestImage):
self.images_mock.deactivate.assert_called_with( self.images_mock.deactivate.assert_called_with(
image_fakes.image_id, image_fakes.image_id,
) )
# ImageManager.update(image, **kwargs) # ImageManager.update(image, **kwargs)
self.images_mock.update.assert_called_with( self.images_mock.update.assert_called_with(
image_fakes.image_id, image_fakes.image_id,
**kwargs **kwargs
) )
self.assertIsNone(result)
def test_image_set_tag_merge(self): def test_image_set_tag_merge(self):
old_image = copy.copy(image_fakes.IMAGE) old_image = copy.copy(image_fakes.IMAGE)
@ -1088,7 +1094,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'tags': ['old1', 'new2', 'test-tag'], 'tags': ['old1', 'new2', 'test-tag'],
@ -1098,6 +1104,7 @@ class TestImageSet(TestImage):
self.assertEqual(image_fakes.image_id, a[0]) self.assertEqual(image_fakes.image_id, a[0])
self.assertTrue('tags' in k) self.assertTrue('tags' in k)
self.assertEqual(set(kwargs['tags']), set(k['tags'])) self.assertEqual(set(kwargs['tags']), set(k['tags']))
self.assertIsNone(result)
def test_image_set_tag_merge_dupe(self): def test_image_set_tag_merge_dupe(self):
old_image = copy.copy(image_fakes.IMAGE) old_image = copy.copy(image_fakes.IMAGE)
@ -1113,7 +1120,7 @@ class TestImageSet(TestImage):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'tags': ['new2', 'old1'], 'tags': ['new2', 'old1'],
@ -1123,6 +1130,7 @@ class TestImageSet(TestImage):
self.assertEqual(image_fakes.image_id, a[0]) self.assertEqual(image_fakes.image_id, a[0])
self.assertTrue('tags' in k) self.assertTrue('tags' in k)
self.assertEqual(set(kwargs['tags']), set(k['tags'])) self.assertEqual(set(kwargs['tags']), set(k['tags']))
self.assertIsNone(result)
def test_image_set_dead_options(self): def test_image_set_dead_options(self):