From 2bcc39516b28d828f51eec67a334b32084d88937 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 5 Jul 2020 11:34:58 +0200 Subject: Reduce Patrole extra logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also reduces the skipped test list taking into account Patrole improvements. Change-Id: I23a8c0610a8a4258aa806451f52796f3e7bc46ca Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/patrole/patrole.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'functest/opnfv_tests/openstack/patrole') diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py index 14f2b17c5..8613d5127 100644 --- a/functest/opnfv_tests/openstack/patrole/patrole.py +++ b/functest/opnfv_tests/openstack/patrole/patrole.py @@ -24,17 +24,9 @@ class Patrole(tempest.TempestCommon): super(Patrole, self).configure(**kwargs) rconfig = configparser.RawConfigParser() rconfig.read(self.conf_file) - rconfig.add_section('rbac') - rconfig.set('rbac', 'enable_rbac', True) - rconfig.set('rbac', 'rbac_test_roles', kwargs.get('role', 'admin')) + if not rconfig.has_section('rbac'): + rconfig.add_section('rbac') + rconfig.set('rbac', 'rbac_test_roles', kwargs.get('roles', 'admin')) with open(self.conf_file, 'w') as config_file: rconfig.write(config_file) self.backup_tempest_config(self.conf_file, self.res_dir) - - def run(self, **kwargs): - for exclude in kwargs.get('excludes', []): - kwargs['mode'] = "{}(?!.*{})".format( - kwargs.get('mode', ''), exclude) - kwargs['mode'] = '{}(?=patrole_tempest_plugin.tests.api.({}))'.format( - kwargs['mode'], '|'.join(kwargs.get('includes', []))) - return super(Patrole, self).run(**kwargs) -- cgit 1.2.3-korg