openstack/python-openstackclient
Code Issues Proposed changes

Skip Volume v1 functional tests if v1 not present

Browse Source 
Volume v1 is gone in Queens

Just skip it for now until DevStack does not create a v1 endpoint

Change-Id: I2aa2f78b0d5c8ac2048c922c7835e5c4574028cc
This commit is contained in:
Dean Troyer 2017-09-09 08:48:58 -05:00
parent 8f4440a6de
commit ce468209c4
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
openstackclient/tests/functional/volume/v1/common.py
View File

@ -12,14 +12,35 @@
import fixtures
from openstackclient.tests.functional.volume import base
from openstackclient.tests.functional import base
from openstackclient.tests.functional.volume import base as volume_base
class BaseVolumeTests(base.BaseVolumeTests):
"""Base class for Volume functional tests. """
class BaseVolumeTests(volume_base.BaseVolumeTests):
"""Base class for Volume functional tests"""
@classmethod
def setUpClass(cls):
super(BaseVolumeTests, cls).setUpClass()
# TODO(dtroyer): This needs to be updated to specifically check for
# Volume v1 rather than just 'volume', but for now
# that is enough until we get proper version negotiation
cls.haz_volume_v1 = base.is_service_enabled('volume')
def setUp(self):
super(BaseVolumeTests, self).setUp()
# This class requires Volume v1
# if not self.haz_volume_v1:
# self.skipTest("No Volume v1 service present")
# TODO(dtroyer): We really want the above to work but right now
# (12Sep2017) DevStack still creates a 'volume'
# service type even though there is no service behind
# it. Until that is fixed we need to just skip the
# volume v1 functional tests in master.
self.skipTest("No Volume v1 service present")
ver_fixture = fixtures.EnvironmentVariable(
'OS_VOLUME_API_VERSION', '1'
)