summaryrefslogtreecommitdiff
path: root/openstackclient/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-28 18:26:02 +0000
committerGerrit Code Review <review@openstack.org>2016-06-28 18:26:03 +0000
commit9422f8bdeae54c27e7ecbe6e3f60a126a3d83dfc (patch)
tree9a1779bee6418906b2993f225994df7c461d2caf /openstackclient/tests
parentbc4acba15ece5b7ff9314f5958db2f9b8e0dc330 (diff)
parent4e46c04f921c81927ded78f17fd28d5a55ebf9e2 (diff)
downloadpython-openstackclient-9422f8bdeae54c27e7ecbe6e3f60a126a3d83dfc.tar.gz
Merge "Add "--force" option to "volume qos delete" command"
Diffstat (limited to 'openstackclient/tests')
-rw-r--r--openstackclient/tests/volume/v1/test_qos_specs.py20
-rw-r--r--openstackclient/tests/volume/v2/test_qos_specs.py18
2 files changed, 35 insertions, 3 deletions
diff --git a/openstackclient/tests/volume/v1/test_qos_specs.py b/openstackclient/tests/volume/v1/test_qos_specs.py
index 392017c6..4e1733fd 100644
--- a/openstackclient/tests/volume/v1/test_qos_specs.py
+++ b/openstackclient/tests/volume/v1/test_qos_specs.py
@@ -211,7 +211,7 @@ class TestQosDelete(TestQos):
result = self.cmd.take_action(parsed_args)
- self.qos_mock.delete.assert_called_with(volume_fakes.qos_id)
+ self.qos_mock.delete.assert_called_with(volume_fakes.qos_id, False)
self.assertIsNone(result)
def test_qos_delete_with_name(self):
@@ -225,7 +225,23 @@ class TestQosDelete(TestQos):
result = self.cmd.take_action(parsed_args)
- self.qos_mock.delete.assert_called_with(volume_fakes.qos_id)
+ self.qos_mock.delete.assert_called_with(volume_fakes.qos_id, False)
+ self.assertIsNone(result)
+
+ def test_qos_delete_with_force(self):
+ arglist = [
+ '--force',
+ volume_fakes.qos_id
+ ]
+ verifylist = [
+ ('force', True),
+ ('qos_specs', [volume_fakes.qos_id])
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.take_action(parsed_args)
+
+ self.qos_mock.delete.assert_called_with(volume_fakes.qos_id, True)
self.assertIsNone(result)
diff --git a/openstackclient/tests/volume/v2/test_qos_specs.py b/openstackclient/tests/volume/v2/test_qos_specs.py
index 11047535..92ffca74 100644
--- a/openstackclient/tests/volume/v2/test_qos_specs.py
+++ b/openstackclient/tests/volume/v2/test_qos_specs.py
@@ -175,7 +175,23 @@ class TestQosDelete(TestQos):
result = self.cmd.take_action(parsed_args)
- self.qos_mock.delete.assert_called_with(self.qos_spec.id)
+ self.qos_mock.delete.assert_called_with(self.qos_spec.id, False)
+ self.assertIsNone(result)
+
+ def test_qos_delete_with_force(self):
+ arglist = [
+ '--force',
+ self.qos_spec.id
+ ]
+ verifylist = [
+ ('force', True),
+ ('qos_specs', [self.qos_spec.id])
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.take_action(parsed_args)
+
+ self.qos_mock.delete.assert_called_with(self.qos_spec.id, True)
self.assertIsNone(result)