From 09b783ad3e5051564bf6321feace3b65739febbf Mon Sep 17 00:00:00 2001
From: Richard Theis <rtheis@us.ibm.com>
Date: Wed, 15 Jun 2016 10:31:26 -0500
Subject: [PATCH] Fix volume functional tests
The volume v2 functional tests occasionally fail with
"unrecognized arguments: --private". This appears to occur when
volume v1 and volume v2 functional tests are run at the same time
when one or more of the tests do not set OS_VOLUME_API_VERSION
appropriately.
This patch also fixes a timing issue seen when running the
tests locally due to a missing wait and moves the snapshot
test to volume v2 since it was written for v2.
Change-Id: I9c9863fe1aef81b0564920f36452c6f27211d5ba
Closes-Bug: #1589793
---
functional/tests/volume/v1/test_qos.py | 3 ++-
functional/tests/volume/v1/test_volume.py | 3 +--
.../tests/volume/v1/test_volume_type.py | 1 +
functional/tests/volume/v2/common.py | 23 +++++++++++++++++++
functional/tests/volume/v2/test_qos.py | 5 ++--
.../tests/volume/{v1 => v2}/test_snapshot.py | 5 ++--
functional/tests/volume/v2/test_volume.py | 8 +++----
.../tests/volume/v2/test_volume_type.py | 5 ++--
8 files changed, 40 insertions(+), 13 deletions(-)
create mode 100644 functional/tests/volume/v2/common.py
rename functional/tests/volume/{v1 => v2}/test_snapshot.py (95%)
diff --git a/functional/tests/volume/v1/test_qos.py b/functional/tests/volume/v1/test_qos.py
index f4b2fec3a6..9324830c8a 100644
--- a/functional/tests/volume/v1/test_qos.py
+++ b/functional/tests/volume/v1/test_qos.py
@@ -15,7 +15,7 @@ import uuid
from functional.tests.volume.v1 import common
-class VolumeTests(common.BaseVolumeTests):
+class QosTests(common.BaseVolumeTests):
"""Functional tests for volume qos. """
NAME = uuid.uuid4().hex
@@ -25,6 +25,7 @@ class VolumeTests(common.BaseVolumeTests):
@classmethod
def setUpClass(cls):
+ super(QosTests, cls).setUpClass()
opts = cls.get_show_opts(cls.FIELDS)
raw_output = cls.openstack('volume qos create ' + cls.NAME + opts)
cls.ID, name, rol = raw_output.split('\n')
diff --git a/functional/tests/volume/v1/test_volume.py b/functional/tests/volume/v1/test_volume.py
index 874be6e115..f574075d75 100644
--- a/functional/tests/volume/v1/test_volume.py
+++ b/functional/tests/volume/v1/test_volume.py
@@ -10,7 +10,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import os
import uuid
from functional.tests.volume.v1 import common
@@ -26,7 +25,7 @@ class VolumeTests(common.BaseVolumeTests):
@classmethod
def setUpClass(cls):
- os.environ['OS_VOLUME_API_VERSION'] = '1'
+ super(VolumeTests, cls).setUpClass()
opts = cls.get_show_opts(cls.FIELDS)
raw_output = cls.openstack('volume create --size 1 ' + cls.NAME + opts)
expected = cls.NAME + '\n'
diff --git a/functional/tests/volume/v1/test_volume_type.py b/functional/tests/volume/v1/test_volume_type.py
index dc8b1f4580..824b20d7c4 100644
--- a/functional/tests/volume/v1/test_volume_type.py
+++ b/functional/tests/volume/v1/test_volume_type.py
@@ -24,6 +24,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
@classmethod
def setUpClass(cls):
+ super(VolumeTypeTests, cls).setUpClass()
opts = cls.get_show_opts(cls.FIELDS)
raw_output = cls.openstack('volume type create ' + cls.NAME + opts)
expected = cls.NAME + '\n'
diff --git a/functional/tests/volume/v2/common.py b/functional/tests/volume/v2/common.py
new file mode 100644
index 0000000000..8652c2d182
--- /dev/null
+++ b/functional/tests/volume/v2/common.py
@@ -0,0 +1,23 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import os
+
+from functional.common import test
+
+
+class BaseVolumeTests(test.TestCase):
+ """Base class for Volume functional tests. """
+
+ @classmethod
+ def setUpClass(cls):
+ os.environ['OS_VOLUME_API_VERSION'] = '2'
diff --git a/functional/tests/volume/v2/test_qos.py b/functional/tests/volume/v2/test_qos.py
index 24ce1b326a..64c3b6c108 100644
--- a/functional/tests/volume/v2/test_qos.py
+++ b/functional/tests/volume/v2/test_qos.py
@@ -12,10 +12,10 @@
import uuid
-from functional.common import test
+from functional.tests.volume.v2 import common
-class VolumeTests(test.TestCase):
+class QosTests(common.BaseVolumeTests):
"""Functional tests for volume qos. """
NAME = uuid.uuid4().hex
@@ -25,6 +25,7 @@ class VolumeTests(test.TestCase):
@classmethod
def setUpClass(cls):
+ super(QosTests, cls).setUpClass()
opts = cls.get_show_opts(cls.FIELDS)
raw_output = cls.openstack('volume qos create ' + cls.NAME + opts)
cls.ID, name, rol = raw_output.split('\n')
diff --git a/functional/tests/volume/v1/test_snapshot.py b/functional/tests/volume/v2/test_snapshot.py
similarity index 95%
rename from functional/tests/volume/v1/test_snapshot.py
rename to functional/tests/volume/v2/test_snapshot.py
index c43a7456ae..40f075323f 100644
--- a/functional/tests/volume/v1/test_snapshot.py
+++ b/functional/tests/volume/v2/test_snapshot.py
@@ -13,10 +13,10 @@
import time
import uuid
-from functional.common import test
+from functional.tests.volume.v2 import common
-class SnapshotTests(test.TestCase):
+class SnapshotTests(common.BaseVolumeTests):
"""Functional tests for snapshot. """
VOLLY = uuid.uuid4().hex
@@ -36,6 +36,7 @@ class SnapshotTests(test.TestCase):
@classmethod
def setUpClass(cls):
+ super(SnapshotTests, cls).setUpClass()
cls.openstack('volume create --size 1 ' + cls.VOLLY)
cls.wait_for_status('volume show ' + cls.VOLLY, 'available\n', 3)
opts = cls.get_show_opts(['status'])
diff --git a/functional/tests/volume/v2/test_volume.py b/functional/tests/volume/v2/test_volume.py
index 9c7f11a1b4..e0c1219cc4 100644
--- a/functional/tests/volume/v2/test_volume.py
+++ b/functional/tests/volume/v2/test_volume.py
@@ -10,14 +10,13 @@
# License for the specific language governing permissions and limitations
# under the License.
-import os
import time
import uuid
-from functional.common import test
+from functional.tests.volume.v2 import common
-class VolumeTests(test.TestCase):
+class VolumeTests(common.BaseVolumeTests):
"""Functional tests for volume. """
NAME = uuid.uuid4().hex
@@ -29,7 +28,7 @@ class VolumeTests(test.TestCase):
@classmethod
def setUpClass(cls):
- os.environ['OS_VOLUME_API_VERSION'] = '2'
+ super(VolumeTests, cls).setUpClass()
opts = cls.get_show_opts(cls.FIELDS)
# Create test volume
@@ -111,6 +110,7 @@ class VolumeTests(test.TestCase):
# Delete test snapshot
raw_output = self.openstack('snapshot delete ' + self.SNAPSHOT_NAME)
self.assertOutput('', raw_output)
+ self.wait_for("volume", self.NAME, "available")
def wait_for(self, check_type, check_name, desired_status, wait=120,
interval=5, failures=['ERROR']):
diff --git a/functional/tests/volume/v2/test_volume_type.py b/functional/tests/volume/v2/test_volume_type.py
index d8a7a7eb39..4c315334c8 100644
--- a/functional/tests/volume/v2/test_volume_type.py
+++ b/functional/tests/volume/v2/test_volume_type.py
@@ -12,10 +12,10 @@
import uuid
-from functional.common import test
+from functional.tests.volume.v2 import common
-class VolumeTypeTests(test.TestCase):
+class VolumeTypeTests(common.BaseVolumeTests):
"""Functional tests for volume type. """
NAME = uuid.uuid4().hex
@@ -24,6 +24,7 @@ class VolumeTypeTests(test.TestCase):
@classmethod
def setUpClass(cls):
+ super(VolumeTypeTests, cls).setUpClass()
opts = cls.get_show_opts(cls.FIELDS)
raw_output = cls.openstack(
'volume type create --private ' + cls.NAME + opts)