openstack/python-openstackclient
Code Issues Proposed changes

Trivial: Reorder test class in test_volume.py into alphabetical order

Browse Source 
TestVolumeDelete should be after TestVolumeCreate.

Change-Id: I764543a0e0723633aec6b18c2d50a01931465e6b
This commit is contained in:
Tang Chen 2016-02-03 12:04:34 +08:00
parent 4b2c66447d
commit e0969655ac
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
openstackclient/tests/volume/v2/test_volume.py
View File

@ -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)