Disable log dump

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

diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index dd1f66b..8a31d6c 100644 (file)
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -33,6 +33,8 @@ class K8sTesting(testcase.TestCase):
     def __init__(self, **kwargs):
         super(K8sTesting, self).__init__(**kwargs)
         self.cmd = []
+        self.res_dir = "/home/opnfv/functest/results/{}".format(
+            self.case_name)
         self.result = 0
         self.start_time = 0
         self.stop_time = 0
@@ -44,10 +46,10 @@ class K8sTesting(testcase.TestCase):
 
         process = subprocess.Popen(cmd_line, stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT)
-        output = process.stdout.read()
-        # Remove color code escape sequences
-        output = re.sub(r'\x1B\[[0-?]*[ -/]*[@-~]', '', str(output))
-
+        boutput = process.stdout.read()
+        with open(os.path.join(self.res_dir, 'e2e.log'), 'wb') as foutput:
+            foutput.write(boutput)
+        output = boutput.decode("utf-8")
         if ('Error loading client' in output or
                 'Unexpected error' in output):
             raise Exception(output)
@@ -121,8 +123,10 @@ class K8sSmokeTest(K8sTesting):
         if "case_name" not in kwargs:
             kwargs.get("case_name", 'k8s_smoke')
         super(K8sSmokeTest, self).__init__(**kwargs)
-        self.cmd = ["e2e.test", "-ginkgo.focus", "Guestbook.application",
-                    "-kubeconfig", self.config, "--provider", "local"]
+        self.cmd = ['e2e.test', '-ginkgo.focus', 'Guestbook.application',
+                    '-ginkgo.noColor', '-kubeconfig', self.config,
+                    '-provider', 'local', '-report-dir', self.res_dir,
+                    '-disable-log-dump', 'true']
 
 
 class K8sConformanceTest(K8sTesting):
@@ -131,5 +135,8 @@ class K8sConformanceTest(K8sTesting):
         if "case_name" not in kwargs:
             kwargs.get("case_name", 'k8s_conformance')
         super(K8sConformanceTest, self).__init__(**kwargs)
-        self.cmd = ['e2e.test', '-ginkgo.focus', 'Conformance',
-                    '-kubeconfig', self.config, "--provider", "local"]
+        self.cmd = [
+            'e2e.test', '-ginkgo.focus', r'\[Conformance\]', '-ginkgo.noColor',
+            '-ginkgo.skip', r'Alpha|\[(Disruptive|Feature:[^\]]+|Flaky)\]',
+            '-kubeconfig', self.config, '-provider', 'local',
+            '-report-dir', self.res_dir, '-disable-log-dump', 'true']