Use framework.ConformanceIt for node e2e conformance tests

This commit is contained in:
xiangpengzhao
2017-10-31 11:55:46 +08:00
parent d20b156995
commit 7fdea2b0cf
4 changed files with 10 additions and 10 deletions

View File

@@ -84,7 +84,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
}, preStopWaitTimeout, podCheckInterval).Should(BeNil())
}
}
It("should execute poststart exec hook properly [Conformance]", func() {
framework.ConformanceIt("should execute poststart exec hook properly", func() {
lifecycle := &v1.Lifecycle{
PostStart: &v1.Handler{
Exec: &v1.ExecAction{
@@ -95,7 +95,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
podWithHook := getPodWithHook("pod-with-poststart-exec-hook", imageutils.GetE2EImage(imageutils.Hostexec), lifecycle)
testPodWithHook(podWithHook)
})
It("should execute prestop exec hook properly [Conformance]", func() {
framework.ConformanceIt("should execute prestop exec hook properly", func() {
lifecycle := &v1.Lifecycle{
PreStop: &v1.Handler{
Exec: &v1.ExecAction{
@@ -106,7 +106,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
podWithHook := getPodWithHook("pod-with-prestop-exec-hook", imageutils.GetE2EImage(imageutils.Hostexec), lifecycle)
testPodWithHook(podWithHook)
})
It("should execute poststart http hook properly [Conformance]", func() {
framework.ConformanceIt("should execute poststart http hook properly", func() {
lifecycle := &v1.Lifecycle{
PostStart: &v1.Handler{
HTTPGet: &v1.HTTPGetAction{
@@ -119,7 +119,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
podWithHook := getPodWithHook("pod-with-poststart-http-hook", framework.GetPauseImageNameForHostArch(), lifecycle)
testPodWithHook(podWithHook)
})
It("should execute prestop http hook properly [Conformance]", func() {
framework.ConformanceIt("should execute prestop http hook properly", func() {
lifecycle := &v1.Lifecycle{
PreStop: &v1.Handler{
HTTPGet: &v1.HTTPGetAction{