diff options
Diffstat (limited to 'functest/opnfv_tests/openstack/patrole/patrole.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/patrole/patrole.py | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py index a00e17c37..efc513cdb 100644 --- a/functest/opnfv_tests/openstack/patrole/patrole.py +++ b/functest/opnfv_tests/openstack/patrole/patrole.py @@ -10,29 +10,16 @@ # pylint: disable=missing-docstring import logging -import os from six.moves import configparser from functest.opnfv_tests.openstack.tempest import tempest -from functest.utils import config class Patrole(tempest.TempestCommon): __logger = logging.getLogger(__name__) - def __init__(self, **kwargs): - if "case_name" not in kwargs: - kwargs["case_name"] = 'patrole' - super(Patrole, self).__init__(**kwargs) - self.res_dir = os.path.join( - getattr(config.CONF, 'dir_results'), 'patrole') - self.list = os.path.join(self.res_dir, 'tempest-list.txt') - - def apply_tempest_blacklist(self): - pass - def configure(self, **kwargs): super(Patrole, self).configure(**kwargs) rconfig = configparser.RawConfigParser() @@ -46,7 +33,8 @@ class Patrole(tempest.TempestCommon): def run(self, **kwargs): for exclude in kwargs.get('exclude', []): - self.mode = "{}(?!.*{})".format(self.mode, exclude) - self.mode = "'{}(?=patrole_tempest_plugin.tests.api.({}))'".format( - self.mode, '|'.join(kwargs.get('services', []))) + kwargs['mode'] = "{}(?!.*{})".format( + kwargs.get('mode', ''), exclude) + kwargs['mode'] = '{}(?=patrole_tempest_plugin.tests.api.({}))'.format( + kwargs['mode'], '|'.join(kwargs.get('services', []))) return super(Patrole, self).run(**kwargs) |