diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-14 04:21:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-14 04:21:18 +0000 |
| commit | e5dd054be88d2bb887d901cc748a6d0162378fa2 (patch) | |
| tree | 92be2cdd07330c30d8c725ec4a24eed3e32251ce /openstackclient | |
| parent | e5e29a8fef7ba2396015918545a49e717fe75d15 (diff) | |
| parent | c7e6973ff50ff84af9ad55f7bdaeeea83ae40f0b (diff) | |
| download | python-openstackclient-e5dd054be88d2bb887d901cc748a6d0162378fa2.tar.gz | |
Merge "Fix errors in flavor unit tests"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/compute/v2/test_flavor.py | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py index 8ce7bb27..27b53bbf 100644 --- a/openstackclient/tests/compute/v2/test_flavor.py +++ b/openstackclient/tests/compute/v2/test_flavor.py @@ -645,6 +645,8 @@ class TestFlavorUnset(TestFlavor): result = self.cmd.take_action(parsed_args) self.flavors_mock.find.assert_called_with(name=parsed_args.flavor, is_public=None) + self.flavor.unset_keys.assert_called_with(['property']) + self.flavor_access_mock.remove_tenant_access.assert_not_called() self.assertIsNone(result) def test_flavor_unset_project(self): @@ -661,24 +663,14 @@ class TestFlavorUnset(TestFlavor): 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.remove_tenant_access.assert_called_with( self.flavor.id, identity_fakes.project_id, ) - - def test_flavor_unset_no_project(self): - arglist = [ - '--project', '', - self.flavor.id, - ] - verifylist = [ - ('project', ''), - ('flavor', self.flavor.id), - ] - - parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + self.flavor.unset_keys.assert_not_called() + self.assertIsNone(result) def test_flavor_unset_no_flavor(self): arglist = [ @@ -687,12 +679,8 @@ class TestFlavorUnset(TestFlavor): verifylist = [ ('project', identity_fakes.project_id), ] - - self.assertRaises(tests_utils.ParserException, - self.check_parser, - self.cmd, - arglist, - verifylist) + self.assertRaises(tests_utils.ParserException, self.check_parser, + self.cmd, arglist, verifylist) def test_flavor_unset_with_unexist_flavor(self): self.flavors_mock.get.side_effect = exceptions.NotFound(None) @@ -707,9 +695,7 @@ class TestFlavorUnset(TestFlavor): ('flavor', 'unexist_flavor'), ] 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) def test_flavor_unset_nothing(self): @@ -719,7 +705,6 @@ class TestFlavorUnset(TestFlavor): verifylist = [ ('flavor', self.flavor.id), ] - parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.assertRaises(exceptions.CommandError, self.cmd.take_action, parsed_args) |