summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-12 17:23:14 +0000
committerGerrit Code Review <review@openstack.org>2016-09-12 17:23:14 +0000
commitc8ecd9a49731a004bf86343a1e2f050ad5fc06f8 (patch)
tree1b307b5a3fce1827a41dd124c1379a4c12cfbe17 /openstackclient
parentd8f2fd3bcde29b7a722c69e635c1185d2c3ae869 (diff)
parent8d59b31c72468d82cbe79a6cf24df28fb3b6cf06 (diff)
downloadpython-openstackclient-c8ecd9a49731a004bf86343a1e2f050ad5fc06f8.tar.gz
Merge "Add functional tests for unset multiple volume type props"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/functional/volume/v1/test_volume_type.py15
-rw-r--r--openstackclient/tests/functional/volume/v2/test_volume_type.py15
2 files changed, 30 insertions, 0 deletions
diff --git a/openstackclient/tests/functional/volume/v1/test_volume_type.py b/openstackclient/tests/functional/volume/v1/test_volume_type.py
index 538545ab..955759b6 100644
--- a/openstackclient/tests/functional/volume/v1/test_volume_type.py
+++ b/openstackclient/tests/functional/volume/v1/test_volume_type.py
@@ -61,6 +61,21 @@ class VolumeTypeTests(common.BaseVolumeTests):
raw_output = self.openstack('volume type show ' + self.NAME + opts)
self.assertEqual("c='d'\n", raw_output)
+ def test_volume_type_set_unset_multiple_properties(self):
+ raw_output = self.openstack(
+ 'volume type set --property a=b --property c=d ' + self.NAME)
+ self.assertEqual("", raw_output)
+
+ opts = self.get_opts(["properties"])
+ raw_output = self.openstack('volume type show ' + self.NAME + opts)
+ self.assertEqual("a='b', c='d'\n", raw_output)
+
+ raw_output = self.openstack(
+ 'volume type unset --property a --property c ' + self.NAME)
+ self.assertEqual("", raw_output)
+ raw_output = self.openstack('volume type show ' + self.NAME + opts)
+ self.assertEqual("\n", raw_output)
+
def test_multi_delete(self):
vol_type1 = uuid.uuid4().hex
vol_type2 = uuid.uuid4().hex
diff --git a/openstackclient/tests/functional/volume/v2/test_volume_type.py b/openstackclient/tests/functional/volume/v2/test_volume_type.py
index b62cbb39..d8bd3a96 100644
--- a/openstackclient/tests/functional/volume/v2/test_volume_type.py
+++ b/openstackclient/tests/functional/volume/v2/test_volume_type.py
@@ -62,6 +62,21 @@ class VolumeTypeTests(common.BaseVolumeTests):
raw_output = self.openstack('volume type show ' + self.NAME + opts)
self.assertEqual("c='d'\n", raw_output)
+ def test_volume_type_set_unset_multiple_properties(self):
+ raw_output = self.openstack(
+ 'volume type set --property a=b --property c=d ' + self.NAME)
+ self.assertEqual("", raw_output)
+
+ opts = self.get_opts(["properties"])
+ raw_output = self.openstack('volume type show ' + self.NAME + opts)
+ self.assertEqual("a='b', c='d'\n", raw_output)
+
+ raw_output = self.openstack(
+ 'volume type unset --property a --property c ' + self.NAME)
+ self.assertEqual("", raw_output)
+ raw_output = self.openstack('volume type show ' + self.NAME + opts)
+ self.assertEqual("\n", raw_output)
+
def test_volume_type_set_unset_project(self):
raw_output = self.openstack(
'volume type set --project admin ' + self.NAME)