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 #36637 from resouer/nits-e2e

Browse Source 
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. 🐱
This commit is contained in:
Kubernetes Submit Queue 2016-12-08 00:43:57 -08:00 committed by GitHub
commit 6b9a944285
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e_node/log_path_test.go
View File

@ -20,13 +20,19 @@ import (
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/kubelet"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/util/uuid"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
. "github.com/onsi/ginkgo" . "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() { var _ = framework.KubeDescribe("ContainerLogPath", func() {
f := framework.NewDefaultFramework("kubelet-container-log-path") f := framework.NewDefaultFramework("kubelet-container-log-path")
@ -39,11 +45,6 @@ var _ = framework.KubeDescribe("ContainerLogPath", func() {
logDirVolumeName := "log-dir-vol" logDirVolumeName := "log-dir-vol"
logDir := kubelet.ContainerLogsDir 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{ logPod := &v1.Pod{
ObjectMeta: v1.ObjectMeta{ ObjectMeta: v1.ObjectMeta{
Name: logPodName, Name: logPodName,