github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85180 from k-toyoda-pi/use_log_e2e_storage_utils

Browse Source 
Use log functions of core framework on e2e/storage/utils
This commit is contained in:
Kubernetes Prow Robot 2019-11-13 13:05:30 -08:00 committed by GitHub
commit c466fd9eaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/storage/utils/BUILD
View File

@ -31,7 +31,6 @@ go_library(
"//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/client-go/util/exec:go_default_library", "//staging/src/k8s.io/client-go/util/exec:go_default_library",
"//test/e2e/framework: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/node:go_default_library",
"//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/pod:go_default_library",
"//test/e2e/framework/ssh:go_default_library", "//test/e2e/framework/ssh:go_default_library",

9
test/e2e/storage/utils/host_exec.go
View File

@ -22,7 +22,6 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/client-go/util/exec" "k8s.io/client-go/util/exec"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
) )
@ -38,10 +37,10 @@ type Result struct {
// LogResult records result log // LogResult records result log
func LogResult(result Result) { func LogResult(result Result) {
remote := result.Host remote := result.Host
e2elog.Logf("exec %s: command: %s", remote, result.Cmd) framework.Logf("exec %s: command: %s", remote, result.Cmd)
e2elog.Logf("exec %s: stdout: %q", remote, result.Stdout) framework.Logf("exec %s: stdout: %q", remote, result.Stdout)
e2elog.Logf("exec %s: stderr: %q", remote, result.Stderr) framework.Logf("exec %s: stderr: %q", remote, result.Stderr)
e2elog.Logf("exec %s: exit code: %d", remote, result.Code) framework.Logf("exec %s: exit code: %d", remote, result.Code)
} }
// HostExec represents interface we require to execute commands on remote host. // HostExec represents interface we require to execute commands on remote host.