diff options
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 5 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 4c5e8663..91a5bb4b 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -172,6 +172,9 @@ def configure_tempest(deployment_dir, IMAGE_ID=None, FLAVOR_ID=None): config.write(config_file) # Copy tempest.conf to /home/opnfv/functest/results/tempest/ + if not os.path.exists(TEMPEST_RESULTS_DIR): + os.makedirs(TEMPEST_RESULTS_DIR) + shutil.copyfile(tempest_conf_file, os.path.join(TEMPEST_RESULTS_DIR, 'tempest.conf')) @@ -205,7 +208,7 @@ def configure_tempest_multisite(deployment_dir): # cmd = ("openstack endpoint show kingbird | grep publicurl |" # "awk '{print $4}' | awk -F '/' '{print $4}'") # kingbird_api_version = os.popen(cmd).read() - kingbird_api_version = os_utils.get_endpoint(service_type='kingbird') + kingbird_api_version = os_utils.get_endpoint(service_type='multisite') if CI_INSTALLER_TYPE == 'fuel': # For MOS based setup, the service is accessible diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 9c19a147..e1a223a7 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -249,12 +249,16 @@ class TempestCommon(testcase_base.TestcaseBase): output = logfile.read() error_logs = "" - for match in re.findall('(.*?)[. ]*FAILED', output): + for match in re.findall('(.*?)[. ]*fail ', output): error_logs += match + skipped_testcase = "" + for match in re.findall('(.*?)[. ]*skip:', output): + skipped_testcase += match self.details = {"tests": int(num_tests), "failures": int(num_failures), - "errors": error_logs} + "errors": error_logs, + "skipped": skipped_testcase} except Exception: success_rate = 0 |