summaryrefslogtreecommitdiff
path: root/openstackclient/tests/volume
diff options
context:
space:
mode:
authorTang Chen <chen.tang@easystack.cn>2016-03-05 17:12:42 +0800
committerTang Chen <chen.tang@easystack.cn>2016-03-05 17:12:42 +0800
commiteb1574281b84e86ee4c4b65d900e1de82c24471e (patch)
tree7a63847be854e6c89a078fae51eefe52accf5e23 /openstackclient/tests/volume
parentfa3a34322c532c6ae09b7b21c305b6a92d99300a (diff)
downloadpython-openstackclient-eb1574281b84e86ee4c4b65d900e1de82c24471e.tar.gz
Test take_action() instead of run() in unit tests
Some of the unit tests test run(), but not take_action(). For example, in openstackclient/tests/volume/v1/test_volume.py, there is: def test_volume_set_size_smaller(self): ...... result = self.cmd.run(parsed_args) self.assertEqual(0, result) ...... run() is defined in class Command in cliff. We don't need to test it in OSC unit tests. On the contrary, we should test take_action(), which is overwritten in each command classes in OSC. Change-Id: If07e89953d40ac530f08cbb1ec05f5805171364b Closes-bug: #1553468
Diffstat (limited to 'openstackclient/tests/volume')
-rw-r--r--openstackclient/tests/volume/v1/test_volume.py12
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 = [