From 5683fe7f51a894fa6e20c53156fc0085e396ed90 Mon Sep 17 00:00:00 2001 From: toyoda Date: Wed, 13 Nov 2019 16:17:11 +0900 Subject: [PATCH] Use log functions of core framework on e2e/storage/utils --- test/e2e/storage/utils/BUILD | 1 - test/e2e/storage/utils/host_exec.go | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/test/e2e/storage/utils/BUILD b/test/e2e/storage/utils/BUILD index 83795177c4d..dc7af122545 100644 --- a/test/e2e/storage/utils/BUILD +++ b/test/e2e/storage/utils/BUILD @@ -31,7 +31,6 @@ go_library( "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/util/exec:go_default_library", "//test/e2e/framework:go_default_library", - "//test/e2e/framework/log:go_default_library", "//test/e2e/framework/node:go_default_library", "//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/ssh:go_default_library", diff --git a/test/e2e/storage/utils/host_exec.go b/test/e2e/storage/utils/host_exec.go index ac1146fdf10..906be96be7c 100644 --- a/test/e2e/storage/utils/host_exec.go +++ b/test/e2e/storage/utils/host_exec.go @@ -22,7 +22,6 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/client-go/util/exec" "k8s.io/kubernetes/test/e2e/framework" - e2elog "k8s.io/kubernetes/test/e2e/framework/log" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" ) @@ -38,10 +37,10 @@ type Result struct { // LogResult records result log func LogResult(result Result) { remote := result.Host - e2elog.Logf("exec %s: command: %s", remote, result.Cmd) - e2elog.Logf("exec %s: stdout: %q", remote, result.Stdout) - e2elog.Logf("exec %s: stderr: %q", remote, result.Stderr) - e2elog.Logf("exec %s: exit code: %d", remote, result.Code) + framework.Logf("exec %s: command: %s", remote, result.Cmd) + framework.Logf("exec %s: stdout: %q", remote, result.Stdout) + framework.Logf("exec %s: stderr: %q", remote, result.Stderr) + framework.Logf("exec %s: exit code: %d", remote, result.Code) } // HostExec represents interface we require to execute commands on remote host.