github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

e2e: Skip init container tests under rkt runtime

Browse Source
This commit is contained in:
Euan Kemp 2016-05-24 15:40:49 -07:00
parent fb56095683
commit d8d63be2dd
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/util.go
View File

@ -366,6 +366,14 @@ func SkipUnlessProviderIs(supportedProviders ...string) {
} }
} }
func SkipIfContainerRuntimeIs(runtimes ...string) {
for _, runtime := range runtimes {
if runtime == TestContext.ContainerRuntime {
Skipf("Not supported under container runtime %s", runtime)
}
}
}
func ProviderIs(providers ...string) bool { func ProviderIs(providers ...string) bool {
for _, provider := range providers { for _, provider := range providers {
if strings.ToLower(provider) == strings.ToLower(TestContext.Provider) { if strings.ToLower(provider) == strings.ToLower(TestContext.Provider) {

4
test/e2e/pods.go
View File

@ -664,6 +664,7 @@ var _ = framework.KubeDescribe("Pods", func() {
}) })
It("should invoke init containers on a RestartNever pod", func() { It("should invoke init containers on a RestartNever pod", func() {
framework.SkipIfContainerRuntimeIs("rkt") // #25988
podClient := f.Client.Pods(f.Namespace.Name) podClient := f.Client.Pods(f.Namespace.Name)
By("creating the pod") By("creating the pod")
@ -729,6 +730,7 @@ var _ = framework.KubeDescribe("Pods", func() {
}) })
It("should invoke init containers on a RestartAlways pod", func() { It("should invoke init containers on a RestartAlways pod", func() {
framework.SkipIfContainerRuntimeIs("rkt") // #25988
podClient := f.Client.Pods(f.Namespace.Name) podClient := f.Client.Pods(f.Namespace.Name)
By("creating the pod") By("creating the pod")
@ -798,6 +800,7 @@ var _ = framework.KubeDescribe("Pods", func() {
}) })
It("should not start app containers if init containers fail on a RestartAlways pod", func() { It("should not start app containers if init containers fail on a RestartAlways pod", func() {
framework.SkipIfContainerRuntimeIs("rkt") // #25988
podClient := f.Client.Pods(f.Namespace.Name) podClient := f.Client.Pods(f.Namespace.Name)
By("creating the pod") By("creating the pod")
@ -913,6 +916,7 @@ var _ = framework.KubeDescribe("Pods", func() {
}) })
It("should not start app containers and fail the pod if init containers fail on a RestartNever pod", func() { It("should not start app containers and fail the pod if init containers fail on a RestartNever pod", func() {
framework.SkipIfContainerRuntimeIs("rkt") // #25988
podClient := f.Client.Pods(f.Namespace.Name) podClient := f.Client.Pods(f.Namespace.Name)
By("creating the pod") By("creating the pod")