Skip to content

Commit c466fd9

Browse files
authored
Merge pull request kubernetes#85180 from k-toyoda-pi/use_log_e2e_storage_utils
Use log functions of core framework on e2e/storage/utils
2 parents 1057f3a + 5683fe7 commit c466fd9

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

test/e2e/storage/utils/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ go_library(
3131
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
3232
"//staging/src/k8s.io/client-go/util/exec:go_default_library",
3333
"//test/e2e/framework:go_default_library",
34-
"//test/e2e/framework/log:go_default_library",
3534
"//test/e2e/framework/node:go_default_library",
3635
"//test/e2e/framework/pod:go_default_library",
3736
"//test/e2e/framework/ssh:go_default_library",

test/e2e/storage/utils/host_exec.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
v1 "k8s.io/api/core/v1"
2323
"k8s.io/client-go/util/exec"
2424
"k8s.io/kubernetes/test/e2e/framework"
25-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2625
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
2726
)
2827

@@ -38,10 +37,10 @@ type Result struct {
3837
// LogResult records result log
3938
func LogResult(result Result) {
4039
remote := result.Host
41-
e2elog.Logf("exec %s: command: %s", remote, result.Cmd)
42-
e2elog.Logf("exec %s: stdout: %q", remote, result.Stdout)
43-
e2elog.Logf("exec %s: stderr: %q", remote, result.Stderr)
44-
e2elog.Logf("exec %s: exit code: %d", remote, result.Code)
40+
framework.Logf("exec %s: command: %s", remote, result.Cmd)
41+
framework.Logf("exec %s: stdout: %q", remote, result.Stdout)
42+
framework.Logf("exec %s: stderr: %q", remote, result.Stderr)
43+
framework.Logf("exec %s: exit code: %d", remote, result.Code)
4544
}
4645

4746
// HostExec represents interface we require to execute commands on remote host.

0 commit comments

Comments
 (0)