diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-07-26 16:59:14 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-07-27 11:21:29 +0200 |
| commit | fa8f32f2d4919ac83a00ea8012a7f0de0de9241c (patch) | |
| tree | d32993019a93c374af118f1834cb6965076d633b /functest/opnfv_tests/openstack/tempest | |
| parent | 49858c476ac1e01917cd886594f3be0425d61f59 (diff) | |
Switch to Python 3.7 and Alpine 3.10
It also allows building docs as doc8 is broken due to latest
OpenStack's upper-constraints.
pylint is updated to 2.3.1 (lastest py3.7 version)
It disables perm as umask is currently false on lf-virtual1.
Change-Id: If09d4796d48b7d0591e7926621d3bbf5ca1b6c24
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index fb0c15512..be86cee86 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -41,13 +41,13 @@ class TempestCommon(singlevm.VmReady2): visibility = 'public' filename_alt = '/home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img' shared_network = True - TEMPEST_CONF_YAML = pkg_resources.resource_filename( + tempest_conf_yaml = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml') - TEMPEST_CUSTOM = pkg_resources.resource_filename( + tempest_custom = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/test_list.txt') - TEMPEST_BLACKLIST = pkg_resources.resource_filename( + tempest_blacklist = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml') @@ -224,7 +224,7 @@ class TempestCommon(singlevm.VmReady2): @staticmethod def update_tempest_conf_file(conf_file, rconfig): """Update defined paramters into tempest config file""" - with open(TempestCommon.TEMPEST_CONF_YAML) as yfile: + with open(TempestCommon.tempest_conf_yaml) as yfile: conf_yaml = yaml.safe_load(yfile) if conf_yaml: sections = rconfig.sections() @@ -244,8 +244,8 @@ class TempestCommon(singlevm.VmReady2): compute_cnt=1, image_alt_id=None, flavor_alt_id=None, admin_role_name='admin', cidr='192.168.120.0/24', domain_id='default'): - # pylint: disable=too-many-branches,too-many-arguments, - # too-many-statements + # pylint: disable=too-many-branches,too-many-arguments + # pylint: disable=too-many-statements,too-many-locals """ Add/update needed parameters into tempest.conf file """ @@ -335,12 +335,12 @@ class TempestCommon(singlevm.VmReady2): LOGGER.debug("Generating test case list...") self.backup_tempest_config(self.conf_file, '/etc') if kwargs.get('mode') == 'custom': - if os.path.isfile(self.TEMPEST_CUSTOM): + if os.path.isfile(self.tempest_custom): shutil.copyfile( - self.TEMPEST_CUSTOM, self.list) + self.tempest_custom, self.list) else: raise Exception("Tempest test list file %s NOT found." - % self.TEMPEST_CUSTOM) + % self.tempest_custom) else: testr_mode = kwargs.get( 'mode', r'^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$') @@ -363,7 +363,7 @@ class TempestCommon(singlevm.VmReady2): deploy_scenario = env.get('DEPLOY_SCENARIO') if bool(deploy_scenario): # if DEPLOY_SCENARIO is set we read the file - black_list_file = open(self.TEMPEST_BLACKLIST) + black_list_file = open(self.tempest_blacklist) black_list_yaml = yaml.safe_load(black_list_file) black_list_file.close() for item in black_list_yaml: |