summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorTang Chen <chen.tang@easystack.cn>2016-02-03 12:04:34 +0800
committerTang Chen <chen.tang@easystack.cn>2016-02-03 12:04:34 +0800
commite0969655ac8257760e4afdadebf568b86a0ae2b3 (patch)
tree52f167bcaa8640ee9dcfd058614aa5789bf7bbab /openstackclient
parent4b2c66447dc253c3b70009976617fd418cdc3a2b (diff)
downloadpython-openstackclient-e0969655ac8257760e4afdadebf568b86a0ae2b3.tar.gz
Trivial: Reorder test class in test_volume.py into alphabetical order
TestVolumeDelete should be after TestVolumeCreate. Change-Id: I764543a0e0723633aec6b18c2d50a01931465e6b
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/volume/v2/test_volume.py82
1 files changed, 41 insertions, 41 deletions
diff --git a/openstackclient/tests/volume/v2/test_volume.py b/openstackclient/tests/volume/v2/test_volume.py
index d61a6c15..fe22b213 100644
--- a/openstackclient/tests/volume/v2/test_volume.py
+++ b/openstackclient/tests/volume/v2/test_volume.py
@@ -363,6 +363,47 @@ class TestVolumeCreate(TestVolume):
self.assertEqual(self.datalist, data)
+class TestVolumeDelete(TestVolume):
+ def setUp(self):
+ super(TestVolumeDelete, self).setUp()
+
+ self.volumes_mock.delete.return_value = None
+
+ # Get the command object to mock
+ self.cmd = volume.DeleteVolume(self.app, None)
+
+ def test_volume_delete_one_volume(self):
+ volumes = self.setup_volumes_mock(count=1)
+
+ arglist = [
+ volumes[0].id
+ ]
+ verifylist = [
+ ("volumes", [volumes[0].id])
+ ]
+
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ self.cmd.take_action(parsed_args)
+ self.volumes_mock.delete.assert_called_with(volumes[0].id)
+
+ def test_volume_delete_multi_volumes(self):
+ volumes = self.setup_volumes_mock(count=3)
+
+ arglist = [v.id for v in volumes]
+ verifylist = [
+ ('volumes', arglist),
+ ]
+
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ self.cmd.take_action(parsed_args)
+
+ calls = [call(v.id) for v in volumes]
+
+ self.volumes_mock.delete.assert_has_calls(calls)
+
+
class TestVolumeList(TestVolume):
columns = [
@@ -696,44 +737,3 @@ class TestVolumeShow(TestVolume):
self.assertEqual(volume_fakes.VOLUME_columns, columns)
self.assertEqual(volume_fakes.VOLUME_data, data)
-
-
-class TestVolumeDelete(TestVolume):
- def setUp(self):
- super(TestVolumeDelete, self).setUp()
-
- self.volumes_mock.delete.return_value = None
-
- # Get the command object to mock
- self.cmd = volume.DeleteVolume(self.app, None)
-
- def test_volume_delete_one_volume(self):
- volumes = self.setup_volumes_mock(count=1)
-
- arglist = [
- volumes[0].id
- ]
- verifylist = [
- ("volumes", [volumes[0].id])
- ]
-
- parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
- self.cmd.take_action(parsed_args)
- self.volumes_mock.delete.assert_called_with(volumes[0].id)
-
- def test_volume_delete_multi_volumes(self):
- volumes = self.setup_volumes_mock(count=3)
-
- arglist = [v.id for v in volumes]
- verifylist = [
- ('volumes', arglist),
- ]
-
- parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
- self.cmd.take_action(parsed_args)
-
- calls = [call(v.id) for v in volumes]
-
- self.volumes_mock.delete.assert_has_calls(calls)