openstack/watcher-tempest-plugin
Code Issues Proposed changes

Merge "Fix skipping of tests"

Browse Source
This commit is contained in:
Zuul 2020-02-05 09:15:59 +00:00 committed by Gerrit Code Review
commit ff4da99bcd
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
watcher_tempest_plugin/tests/api/admin/base.py
View File

@ -17,12 +17,15 @@
import functools import functools
import time import time
from tempest import config
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils from tempest.lib.common.utils import test_utils
from tempest import test from tempest import test
from watcher_tempest_plugin import infra_optim_clients as clients from watcher_tempest_plugin import infra_optim_clients as clients
CONF = config.CONF
class BaseInfraOptimTest(test.BaseTestCase): class BaseInfraOptimTest(test.BaseTestCase):
"""Base class for Infrastructure Optimization API tests.""" """Base class for Infrastructure Optimization API tests."""
@ -39,6 +42,12 @@ class BaseInfraOptimTest(test.BaseTestCase):
'CANCELLED', 'CANCELLED',
'SUPERSEDED') 'SUPERSEDED')
@classmethod
def skip_checks(cls):
super(BaseInfraOptimTest, cls).skip_checks()
if not CONF.service_available.watcher:
raise cls.skipException('Watcher support is required')
@classmethod @classmethod
def setup_credentials(cls): def setup_credentials(cls):
super(BaseInfraOptimTest, cls).setup_credentials() super(BaseInfraOptimTest, cls).setup_credentials()

6
watcher_tempest_plugin/tests/scenario/manager.py
View File

@ -31,6 +31,12 @@ class ScenarioTest(tempest.test.BaseTestCase):
credentials = ['primary', 'admin'] credentials = ['primary', 'admin']
@classmethod
def skip_checks(cls):
super(ScenarioTest, cls).skip_checks()
if not CONF.service_available.watcher:
raise cls.skipException('Watcher support is required')
@classmethod @classmethod
def setup_clients(cls): def setup_clients(cls):
super(ScenarioTest, cls).setup_clients() super(ScenarioTest, cls).setup_clients()