aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/tempest
diff options
context:
space:
mode:
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py2
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 2313ec04..7c88fc5d 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -336,7 +336,7 @@ def configure_tempest_update_params(tempest_conf_file,
'into tempest.conf file')
with open(TEMPEST_CONF_YAML) as f:
conf_yaml = yaml.safe_load(f)
- if not conf_yaml:
+ if conf_yaml:
sections = config.sections()
for section in conf_yaml:
if section not in sections:
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 4993c74a..b00bc6af 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -196,13 +196,13 @@ class TempestCommon(testcase.OSGCTestCase):
output = logfile.read()
success_testcases = []
- for match in re.findall('(.*?)[. ]*success ', output):
+ for match in re.findall('.*\{0\} (.*?)[. ]*success ', output):
success_testcases.append(match)
failed_testcases = []
- for match in re.findall('(.*?)[. ]*fail ', output):
+ for match in re.findall('.*\{0\} (.*?)[. ]*fail ', output):
failed_testcases.append(match)
skipped_testcases = []
- for match in re.findall('(.*?)[. ]*skip:', output):
+ for match in re.findall('.*\{0\} (.*?)[. ]*skip:', output):
skipped_testcases.append(match)
self.details = {"tests": int(num_tests),