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 #82812 from zouyee/emp

Browse Source 
fix emptyDir volumes pod should support shared volumes between containers
This commit is contained in:
Kubernetes Prow Robot 2019-09-18 11:11:32 -07:00 committed by GitHub
commit ae99e2d412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/common/empty_dir.go
View File

@ -19,10 +19,9 @@ package common
import (
"fmt"
"path"
"time"
"github.com/onsi/ginkgo"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/kubernetes/test/e2e/framework"
@ -290,8 +289,8 @@ var _ = ginkgo.Describe("[sig-storage] EmptyDir volumes", func() {
framework.ExpectNoError(err, "failed to get pod %s", pod.Name)
ginkgo.By("Reading file content from the nginx-container")
resultString, err = framework.LookForStringInFile(f.Namespace.Name, pod.Name, busyBoxMainContainerName, busyBoxMainVolumeFilePath, message, 30*time.Second)
framework.ExpectNoError(err, "failed to match expected string %s with %s", message, resultString)
result := f.ExecShellInContainer(pod.Name, busyBoxMainContainerName, fmt.Sprintf("cat %s", busyBoxMainVolumeFilePath))
framework.ExpectEqual(result, message, "failed to match expected string %s with %s", message, resultString)
})
})