aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2023-12-20 15:29:02 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2023-12-20 16:28:22 +0100
commitad19ed4e247371a1cc8cafcc43eb31e11451c986 (patch)
tree48e59194134843fc8ea84296ae0fbfffb8dce411
parent346e889dbb364d28d021db1595d8d4e2778bc2d2 (diff)
Exit if early failure in cnf_testsuite
Change-Id: I3a6a264a73bdc73c1c90471948316d216cf6ad98 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 65780898fb6c3d4d7131916a6a6e342f3557b685)
-rw-r--r--functest_kubernetes/cnf_conformance/conformance.py30
1 files changed, 23 insertions, 7 deletions
diff --git a/functest_kubernetes/cnf_conformance/conformance.py b/functest_kubernetes/cnf_conformance/conformance.py
index 9e3bea00..1b357d8d 100644
--- a/functest_kubernetes/cnf_conformance/conformance.py
+++ b/functest_kubernetes/cnf_conformance/conformance.py
@@ -60,17 +60,33 @@ class CNFConformance(testcase.TestCase):
if os.path.exists(os.path.join(self.src_dir, "results")):
shutil.rmtree(os.path.join(self.src_dir, "results"))
os.chdir(self.src_dir)
- cmd = ['cnf-testsuite', 'setup']
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+ cmd = ['cnf-testsuite', 'setup', '-l DEBUG']
+ try:
+ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+ except subprocess.CalledProcessError as exc:
+ self.__logger.exception(
+ "Cannot run %s:\n%s", ' '.join(exc.cmd),
+ exc.output.decode("utf-8"))
+ self.result = 0
+ return False
self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
cmd = ['cnf-testsuite', 'cnf_setup',
- 'cnf-config=cnf-testsuite.yml']
- output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+ 'cnf-config=cnf-testsuite.yml', '-l DEBUG']
+ try:
+ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+ except subprocess.CalledProcessError as exc:
+ self.__logger.exception(
+ "Cannot run %s:\n%s", ' '.join(exc.cmd),
+ exc.output.decode("utf-8"))
+ self.result = 0
+ return False
self.__logger.info("%s\n%s", " ".join(cmd), output.decode("utf-8"))
+ return True
def run_conformance(self, **kwargs):
"""Run CNF Conformance"""
- cmd = ['cnf-testsuite', kwargs.get("tag", self.default_tag)]
+ cmd = ['cnf-testsuite', kwargs.get("tag", self.default_tag),
+ '-l DEBUG']
output = subprocess.run(
cmd, stderr=subprocess.STDOUT, stdout=subprocess.PIPE,
check=False).stdout
@@ -109,8 +125,8 @@ class CNFConformance(testcase.TestCase):
def run(self, **kwargs):
""""Running the test with example CNF"""
self.start_time = time.time()
- self.setup()
- self.run_conformance(**kwargs)
+ if self.setup():
+ self.run_conformance(**kwargs)
self.stop_time = time.time()
def clean(self):