github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82878 from adelina-t/fix_82876

Browse Source 
Check for terminated reason appropriate for containerD and dockershim
This commit is contained in:
Kubernetes Prow Robot
2019-11-13 21:45:49 -08:00
committed by GitHub
parent cb7cd5d7c6 3ba4c686a4
commit b2a2ade1a1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/windows/security_context.go
View File

@@ -50,8 +50,8 @@ var _ = SIGDescribe("[Feature:Windows] SecurityContext RunAsUserName", func() {
podInvalid, _ = f.PodClient().Get(podInvalid.Name, metav1.GetOptions{}) podInvalid, _ = f.PodClient().Get(podInvalid.Name, metav1.GetOptions{})
podTerminatedReason := testutils.TerminatedContainers(podInvalid)[runAsUserNameContainerName] podTerminatedReason := testutils.TerminatedContainers(podInvalid)[runAsUserNameContainerName]
if "ContainerCannotRun" != podTerminatedReason { if podTerminatedReason != "ContainerCannotRun" && podTerminatedReason != "StartError" {
framework.Failf("The container terminated reason was supposed to be: 'ContainerCannotRun', not: '%q'", podTerminatedReason) framework.Failf("The container terminated reason was supposed to be: 'ContainerCannotRun' or 'StartError', not: '%q'", podTerminatedReason)
} }
}) })