diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-22 14:37:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-22 14:37:44 +0000 |
| commit | 775b1acccd9c2ea78b4b46a2dac9e812b3b1eff6 (patch) | |
| tree | 492601fd24ef2e22a8c30a7acd9735f6cb1dd6d2 /openstackclient/tests | |
| parent | de909e4afc73ab88af6925314869d11564033842 (diff) | |
| parent | 9c62af8a42ebfeb60d88f5ad0af7c1c2fd562853 (diff) | |
| download | python-openstackclient-775b1acccd9c2ea78b4b46a2dac9e812b3b1eff6.tar.gz | |
Merge "Make set/unset commands in compute/image/common return normally when nothing specified"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/compute/v2/test_flavor.py | 15 | ||||
| -rw-r--r-- | openstackclient/tests/image/v1/test_image.py | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py index aea31644..da76b6d7 100644 --- a/openstackclient/tests/compute/v2/test_flavor.py +++ b/openstackclient/tests/compute/v2/test_flavor.py @@ -596,8 +596,12 @@ class TestFlavorSet(TestFlavor): ('flavor', self.flavor.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + result = self.cmd.take_action(parsed_args) + + self.flavors_mock.find.assert_called_with(name=parsed_args.flavor, + is_public=None) + self.flavor_access_mock.add_tenant_access.assert_not_called() + self.assertIsNone(result) class TestFlavorShow(TestFlavor): @@ -771,5 +775,8 @@ class TestFlavorUnset(TestFlavor): ('flavor', self.flavor.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + + result = self.cmd.take_action(parsed_args) + self.assertIsNone(result) + + self.flavor_access_mock.remove_tenant_access.assert_not_called() diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py index 99c0b0ee..14aa331f 100644 --- a/openstackclient/tests/image/v1/test_image.py +++ b/openstackclient/tests/image/v1/test_image.py @@ -475,8 +475,8 @@ class TestImageSet(TestImage): result = self.cmd.take_action(parsed_args) - # Verify update() was not called, if it was show the args - self.assertEqual(self.images_mock.update.call_args_list, []) + self.images_mock.update.assert_called_with(image_fakes.image_id, + **{}) self.assertIsNone(result) def test_image_set_options(self): |