diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-29 18:37:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-29 18:37:44 +0000 |
| commit | 8a3fc6c34368079d6c79cfc236c68ee8d1cb1ef4 (patch) | |
| tree | c30523bea1cc19376fbf18c38eb67a64e433aaaa /openstackclient/tests | |
| parent | 60345b79331eab9773ea1c9421b5fd6a4d495988 (diff) | |
| parent | f37eda3a27dc88d3186d21eca328cca086ee3647 (diff) | |
| download | python-openstackclient-8a3fc6c34368079d6c79cfc236c68ee8d1cb1ef4.tar.gz | |
Merge "Make SetFlavor and UnsetFlavor inherit from cliff.Command"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/compute/v2/test_flavor.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py index 5000e6a0..03ca8807 100644 --- a/openstackclient/tests/compute/v2/test_flavor.py +++ b/openstackclient/tests/compute/v2/test_flavor.py @@ -285,15 +285,12 @@ class TestFlavorSet(TestFlavor): ('property', {'FOO': '"B A R"'}), ('flavor', 'baremetal') ] - parsed_args = self.check_parser(self.cmd, arglist, verifylist) - columns, data = self.cmd.take_action(parsed_args) + result = self.cmd.take_action(parsed_args) self.flavors_mock.find.assert_called_with(name='baremetal') - - self.assertEqual('properties', columns[6]) - self.assertIn('FOO=\'"B A R"\'', data[6]) + self.assertIsNone(result) class TestFlavorShow(TestFlavor): @@ -382,12 +379,9 @@ class TestFlavorUnset(TestFlavor): ('property', ['property']), ('flavor', 'baremetal'), ] - parsed_args = self.check_parser(self.cmd, arglist, verifylist) - columns, data = self.cmd.take_action(parsed_args) + result = self.cmd.take_action(parsed_args) self.flavors_mock.find.assert_called_with(name='baremetal') - - self.assertEqual('properties', columns[6]) - self.assertNotIn('property', data[6]) + self.assertIsNone(result) |