github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #75011 from msau42/fix-readonly-e2e 

don't check for container status ready in subpath test
pull/564/head
Kubernetes Prow Robot 2019-03-06 03:26:47 -08:00 committed by GitHub
parent 4e6329400a b90ef213af
commit 87f9429087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/storage/testsuites/subpath.go
View File

@ -745,8 +745,6 @@ func waitForPodSubpathError(f *framework.Framework, pod *v1.Pod, allowContainerT
// 0 is the container that uses subpath // 0 is the container that uses subpath
if status.Name == subpathContainerName { if status.Name == subpathContainerName {
switch { switch {
case status.State.Running != nil:
return false, fmt.Errorf("subpath container unexpectedly became running")
case status.State.Terminated != nil: case status.State.Terminated != nil:
if status.State.Terminated.ExitCode != 0 && allowContainerTerminationError { if status.State.Terminated.ExitCode != 0 && allowContainerTerminationError {
return true, nil return true, nil