aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2018-10-10 13:08:18 +0300
committerJuha Kosonen <juha.kosonen@nokia.com>2018-10-11 06:22:56 +0000
commit6137435bebd81625efe55b5654c529e47e050af0 (patch)
tree40a0367056b3dbcbfd971e6a4c64a9d268774da8
parentb60fb21cb436d0bf804aa143f265c7533f029c38 (diff)
Set Ginkgo's reporter not to print out in color
Change-Id: If0ef89ba521d02b5ea1a1fcb5bc3e546f93e2859 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit 51fb9ee1ff83d90874bd24847df33739a7cf1b79)
-rw-r--r--functest_kubernetes/k8stest.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py
index dd1f66bc..59eb999e 100644
--- a/functest_kubernetes/k8stest.py
+++ b/functest_kubernetes/k8stest.py
@@ -45,9 +45,6 @@ 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))
-
if ('Error loading client' in output or
'Unexpected error' in output):
raise Exception(output)
@@ -121,8 +118,9 @@ 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']
class K8sConformanceTest(K8sTesting):
@@ -132,4 +130,5 @@ class K8sConformanceTest(K8sTesting):
kwargs.get("case_name", 'k8s_conformance')
super(K8sConformanceTest, self).__init__(**kwargs)
self.cmd = ['e2e.test', '-ginkgo.focus', 'Conformance',
- '-kubeconfig', self.config, "--provider", "local"]
+ '-ginkgo.noColor', '-kubeconfig', self.config,
+ '--provider', 'local']