diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-23 20:55:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-23 20:55:08 +0000 |
| commit | 28f261eeca421b199951b12aaa8bc922c5bd6b8b (patch) | |
| tree | d90e3c67b87edf7461b86af9c23d7dafd7990afb /functional | |
| parent | b7909252a586d84042bf2dfec82000b2ded6101e (diff) | |
| parent | 4e62e1e2e18cb93ba0f88bff8727182b1002de4b (diff) | |
| download | python-openstackclient-28f261eeca421b199951b12aaa8bc922c5bd6b8b.tar.gz | |
Merge "support multi-delete for volume-type"
Diffstat (limited to 'functional')
| -rw-r--r-- | functional/tests/volume/v1/test_volume_type.py | 13 | ||||
| -rw-r--r-- | functional/tests/volume/v2/test_volume_type.py | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/functional/tests/volume/v1/test_volume_type.py b/functional/tests/volume/v1/test_volume_type.py index 824b20d7..5f1f957e 100644 --- a/functional/tests/volume/v1/test_volume_type.py +++ b/functional/tests/volume/v1/test_volume_type.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +import time import uuid from functional.tests.volume.v1 import common @@ -59,3 +60,15 @@ class VolumeTypeTests(common.BaseVolumeTests): self.assertEqual("", raw_output) raw_output = self.openstack('volume type show ' + self.NAME + opts) self.assertEqual("c='d'\n", raw_output) + + def test_multi_delete(self): + vol_type1 = uuid.uuid4().hex + vol_type2 = uuid.uuid4().hex + self.openstack('volume type create ' + vol_type1) + time.sleep(5) + self.openstack('volume type create ' + vol_type2) + time.sleep(5) + cmd = 'volume type delete %s %s' % (vol_type1, vol_type2) + time.sleep(5) + raw_output = self.openstack(cmd) + self.assertOutput('', raw_output) diff --git a/functional/tests/volume/v2/test_volume_type.py b/functional/tests/volume/v2/test_volume_type.py index 4c315334..114e4298 100644 --- a/functional/tests/volume/v2/test_volume_type.py +++ b/functional/tests/volume/v2/test_volume_type.py @@ -10,6 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. +import time import uuid from functional.tests.volume.v2 import common @@ -69,3 +70,15 @@ class VolumeTypeTests(common.BaseVolumeTests): raw_output = self.openstack( 'volume type unset --project admin ' + self.NAME) self.assertEqual("", raw_output) + + def test_multi_delete(self): + vol_type1 = uuid.uuid4().hex + vol_type2 = uuid.uuid4().hex + self.openstack('volume type create ' + vol_type1) + time.sleep(5) + self.openstack('volume type create ' + vol_type2) + time.sleep(5) + cmd = 'volume type delete %s %s' % (vol_type1, vol_type2) + time.sleep(5) + raw_output = self.openstack(cmd) + self.assertOutput('', raw_output) |