diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-07 16:01:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-07 16:01:17 +0000 |
| commit | dcc27fd5d31124e3b25f17de9b91cfe833b4ff0c (patch) | |
| tree | 81e2f9242464cdb880e5a16cc4bcb970c84cbbf7 /openstackclient/tests/volume | |
| parent | fc24f37ae28e1b7f6b9587a8062a314d660a0136 (diff) | |
| parent | eb1574281b84e86ee4c4b65d900e1de82c24471e (diff) | |
| download | python-openstackclient-dcc27fd5d31124e3b25f17de9b91cfe833b4ff0c.tar.gz | |
Merge "Test take_action() instead of run() in unit tests"
Diffstat (limited to 'openstackclient/tests/volume')
| -rw-r--r-- | openstackclient/tests/volume/v1/test_volume.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openstackclient/tests/volume/v1/test_volume.py b/openstackclient/tests/volume/v1/test_volume.py index 35fc917f..e0fd1c08 100644 --- a/openstackclient/tests/volume/v1/test_volume.py +++ b/openstackclient/tests/volume/v1/test_volume.py @@ -577,11 +577,11 @@ class TestVolumeSet(TestVolume): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - result = self.cmd.run(parsed_args) + result = self.cmd.take_action(parsed_args) - self.assertEqual(0, result) self.assertEqual("No changes requested\n", self.app.log.messages.get('error')) + self.assertIsNone(result) def test_volume_set_name(self): arglist = [ @@ -673,12 +673,12 @@ class TestVolumeSet(TestVolume): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - result = self.cmd.run(parsed_args) + result = self.cmd.take_action(parsed_args) - self.assertEqual(0, result) self.assertEqual("New size must be greater than %s GB" % volume_fakes.volume_size, self.app.log.messages.get('error')) + self.assertIsNone(result) def test_volume_set_size_not_available(self): self.volumes_mock.get.return_value.status = 'error' @@ -695,12 +695,12 @@ class TestVolumeSet(TestVolume): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - result = self.cmd.run(parsed_args) + result = self.cmd.take_action(parsed_args) - self.assertEqual(0, result) self.assertEqual("Volume is in %s state, it must be available before " "size can be extended" % 'error', self.app.log.messages.get('error')) + self.assertIsNone(result) def test_volume_set_property(self): arglist = [ |