diff options
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | functest_kubernetes/k8stest.py | 10 | ||||
| -rw-r--r-- | functest_kubernetes/test_k8stest.py | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 82c297a5..304412a3 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -14,7 +14,7 @@ RUN apk --no-cache add --update make py-pip bash git \ make kubectl ginkgo && \ make WHAT=test/e2e/e2e.test && \ mv _output/bin/* /usr/local/bin) && \ - rm -r /src/k8s.io/kubernetes/.git /src/k8s.io/kubernetes/_output && \ + rm -r /src/k8s.io && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/functest_kubernetes/k8stest.py b/functest_kubernetes/k8stest.py index c78959ca..8a31d6c1 100644 --- a/functest_kubernetes/k8stest.py +++ b/functest_kubernetes/k8stest.py @@ -46,7 +46,10 @@ class K8sTesting(testcase.TestCase): process = subprocess.Popen(cmd_line, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - output = process.stdout.read().decode("utf-8") + 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) @@ -122,7 +125,8 @@ class K8sSmokeTest(K8sTesting): super(K8sSmokeTest, self).__init__(**kwargs) self.cmd = ['e2e.test', '-ginkgo.focus', 'Guestbook.application', '-ginkgo.noColor', '-kubeconfig', self.config, - '-provider', 'local', '-report-dir', self.res_dir] + '-provider', 'local', '-report-dir', self.res_dir, + '-disable-log-dump', 'true'] class K8sConformanceTest(K8sTesting): @@ -135,4 +139,4 @@ class K8sConformanceTest(K8sTesting): '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] + '-report-dir', self.res_dir, '-disable-log-dump', 'true'] diff --git a/functest_kubernetes/test_k8stest.py b/functest_kubernetes/test_k8stest.py index b03bb6dc..a94fdf88 100644 --- a/functest_kubernetes/test_k8stest.py +++ b/functest_kubernetes/test_k8stest.py @@ -64,6 +64,7 @@ class K8sTests(unittest.TestCase): mock_logger.exception.assert_called_with( "Error with running kubetest:") + @mock.patch('six.moves.builtins.open', mock.mock_open()) @mock.patch('functest_kubernetes.k8stest.os.path.isfile') @mock.patch('functest_kubernetes.k8stest.subprocess.Popen') def test_run(self, mock_open, mock_isfile): |