Override default Xtesting logs in cnf-conformance

[functest-kubernetes.git] / functest_kubernetes / k8stest.py

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index 55a1823..5d3720a 100644 (file)
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -46,10 +46,8 @@ class E2ETesting(testcase.TestCase):
         """Run the test suites"""
         cmd_line = ['e2e.test', '-ginkgo.noColor', '-kubeconfig', self.config,
                     '-provider', 'local', '-report-dir', self.res_dir]
-        if kwargs.get("focus"):
-            cmd_line.extend(['-ginkgo.focus', kwargs.get("focus")])
-        if kwargs.get("skip"):
-            cmd_line.extend(['-ginkgo.skip', kwargs.get("skip")])
+        for arg in kwargs:
+            cmd_line.extend(['-ginkgo.{}'.format(arg), kwargs.get(arg)])
         cmd_line.extend(['-disable-log-dump', 'true'])
         self.__logger.info("Starting k8s test: '%s'.", cmd_line)
         process = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
@@ -59,7 +57,8 @@ class E2ETesting(testcase.TestCase):
             foutput.write(boutput)
         grp = re.search(
             r'^(FAIL|SUCCESS)!.* ([0-9]+) Passed \| ([0-9]+) Failed \|'
-            r' ([0-9]+) Pending \| ([0-9]+) Skipped', boutput.decode("utf-8"),
+            r' ([0-9]+) Pending \| ([0-9]+) Skipped',
+            boutput.decode("utf-8", errors="ignore"),
             re.MULTILINE | re.DOTALL)
         assert grp
         self.details['passed'] = int(grp.group(2))
@@ -73,7 +72,8 @@ class E2ETesting(testcase.TestCase):
         self.__logger.debug("result: %s", self.result)
         if grp.group(1) == 'FAIL':
             grp2 = re.search(
-                r'^(Summarizing [0-9]+ Failure.*)Ran', boutput.decode("utf-8"),
+                r'^(Summarizing [0-9]+ Failure.*)Ran',
+                boutput.decode("utf-8", errors="ignore"),
                 re.MULTILINE | re.DOTALL)
             if grp2:
                 self.__logger.error(grp2.group(1))