Merge pull request #36637 from resouer/nits-e2e

Automatic merge from submit-queue Fix useless uuid in container log path node e2e @timstclair pointed out there're nits in original PR, ref: https://github.com/kubernetes/kubernetes/pull/34877 So this patch: 1. removed useless uuid 2. change all those strings to const Thanks. 🐱

Merge pull request #36637 from resouer/nits-e2e
6b9a9442 · Kubernetes Submit Queue · GitHub · f8dd91fb · 3002f571 · 6b9a9442
Commit 6b9a9442 authored Dec 08, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

log_path_test.go test/e2e_node/log_path_test.go +8 -7

No files found.
--- a/test/e2e_node/log_path_test.go
+++ b/test/e2e_node/log_path_test.go
@@ -20,13 +20,19 @@ import (
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/kubelet"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
-	"k8s.io/kubernetes/pkg/util/uuid"
 	"k8s.io/kubernetes/test/e2e/framework"

 	. "github.com/onsi/ginkgo"
 )

-const logString = "This is the expected log content of this node e2e test"
+const (
+	logString = "This is the expected log content of this node e2e test"
+
+	logPodName    = "logger-pod"
+	logContName   = "logger-container"
+	checkPodName  = "checker-pod"
+	checkContName = "checker-container"
+)

 var _ = framework.KubeDescribe("ContainerLogPath", func() {
 	f := framework.NewDefaultFramework("kubelet-container-log-path")
@@ -39,11 +45,6 @@ var _ = framework.KubeDescribe("ContainerLogPath", func() {
 				logDirVolumeName := "log-dir-vol"
 				logDir := kubelet.ContainerLogsDir

-				logPodName := "logger-" + string(uuid.NewUUID())
-				logContName := "logger-c-" + string(uuid.NewUUID())
-				checkPodName := "checker" + string(uuid.NewUUID())
-				checkContName := "checker-c-" + string(uuid.NewUUID())
-
 				logPod := &v1.Pod{
 					ObjectMeta: v1.ObjectMeta{
 						Name: logPodName,