diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-28 16:14:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-28 16:14:13 +0000 |
| commit | 6bf60180a2968d93946fdc8b924cf4057f5713df (patch) | |
| tree | ee6d8021d7858fbb63f0b3b40d3ecbde0ae2e579 /openstackclient/tests | |
| parent | 941217a5f391941925339acaeb6892fe5d1cf5b2 (diff) | |
| parent | 4524b3605fa4260a2f916421eebfc7a99b320e4b (diff) | |
| download | python-openstackclient-6bf60180a2968d93946fdc8b924cf4057f5713df.tar.gz | |
Merge "Fix error in flavor set/unset command"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/compute/v2/test_flavor.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py index 03ca8807..fa29111b 100644 --- a/openstackclient/tests/compute/v2/test_flavor.py +++ b/openstackclient/tests/compute/v2/test_flavor.py @@ -288,8 +288,10 @@ class TestFlavorSet(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - - self.flavors_mock.find.assert_called_with(name='baremetal') + try: + self.flavors_mock.find.assert_called_with(name=parsed_args.flavor) + except Exception: + self.flavors_mock.get.assert_called_with(parsed_args.flavor) self.assertIsNone(result) @@ -382,6 +384,8 @@ class TestFlavorUnset(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - - self.flavors_mock.find.assert_called_with(name='baremetal') + try: + self.flavors_mock.find.assert_called_with(name=parsed_args.flavor) + except Exception: + self.flavors_mock.get.assert_called_with(parsed_args.flavor) self.assertIsNone(result) |