openstack/python-openstackclient
Code Issues Proposed changes

Merge "Fix errors in `set/unset flavor` unit tests"

Browse Source
This commit is contained in:
Jenkins 2016-06-14 19:18:21 +00:00 committed by Gerrit Code Review
commit df235a00d1
1 changed files with 20 additions and 9 deletions

29
openstackclient/tests/compute/v2/test_flavor.py

@ -469,6 +469,7 @@ class TestFlavorSet(TestFlavor):
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.flavors_mock.find.assert_called_with(name=parsed_args.flavor, self.flavors_mock.find.assert_called_with(name=parsed_args.flavor,
is_public=None) is_public=None)
self.flavor.set_keys.assert_called_with({'FOO': '"B A R"'})
self.assertIsNone(result) self.assertIsNone(result)
def test_flavor_set_project(self): def test_flavor_set_project(self):
@ -483,12 +484,15 @@ class TestFlavorSet(TestFlavor):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.assertIsNone(result)
self.flavors_mock.find.assert_called_with(name=parsed_args.flavor,
is_public=None)
self.flavor_access_mock.add_tenant_access.assert_called_with( self.flavor_access_mock.add_tenant_access.assert_called_with(
self.flavor.id, self.flavor.id,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.flavor.set_keys.assert_not_called()
self.assertIsNone(result)
def test_flavor_set_no_project(self): def test_flavor_set_no_project(self):
arglist = [ arglist = [
@ -496,7 +500,7 @@ class TestFlavorSet(TestFlavor):
self.flavor.id, self.flavor.id,
] ]
verifylist = [ verifylist = [
('project', ''), ('project', None),
('flavor', self.flavor.id), ('flavor', self.flavor.id),
] ]
self.assertRaises(tests_utils.ParserException, self.check_parser, self.assertRaises(tests_utils.ParserException, self.check_parser,
@ -509,12 +513,8 @@ class TestFlavorSet(TestFlavor):
verifylist = [ verifylist = [
('project', identity_fakes.project_id), ('project', identity_fakes.project_id),
] ]
self.assertRaises(tests_utils.ParserException, self.check_parser,
self.assertRaises(tests_utils.ParserException, self.cmd, arglist, verifylist)
self.check_parser,
self.cmd,
arglist,
verifylist)
def test_flavor_set_with_unexist_flavor(self): def test_flavor_set_with_unexist_flavor(self):
self.flavors_mock.get.side_effect = exceptions.NotFound(None) self.flavors_mock.get.side_effect = exceptions.NotFound(None)
@ -541,7 +541,6 @@ class TestFlavorSet(TestFlavor):
verifylist = [ verifylist = [
('flavor', self.flavor.id), ('flavor', self.flavor.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.assertRaises(exceptions.CommandError, self.cmd.take_action, self.assertRaises(exceptions.CommandError, self.cmd.take_action,
parsed_args) parsed_args)
@ -672,6 +671,18 @@ class TestFlavorUnset(TestFlavor):
self.flavor.unset_keys.assert_not_called() self.flavor.unset_keys.assert_not_called()
self.assertIsNone(result) self.assertIsNone(result)
def test_flavor_unset_no_project(self):
arglist = [
'--project',
self.flavor.id,
]
verifylist = [
('project', None),
('flavor', self.flavor.id),
]
self.assertRaises(tests_utils.ParserException, self.check_parser,
self.cmd, arglist, verifylist)
def test_flavor_unset_no_flavor(self): def test_flavor_unset_no_flavor(self):
arglist = [ arglist = [
'--project', identity_fakes.project_id, '--project', identity_fakes.project_id,