diff --git a/test/e2e/common/configmap.go b/test/e2e/common/configmap.go index 91f88277db8..47780ff977f 100644 --- a/test/e2e/common/configmap.go +++ b/test/e2e/common/configmap.go @@ -191,7 +191,7 @@ var _ = framework.KubeDescribe("ConfigMap", func() { }) }) - It("should be consumable in multiple volumes in the same pod", func() { + It("should be consumable in multiple volumes in the same pod [Conformance]", func() { var ( name = "configmap-test-volume-" + string(uuid.NewUUID()) volumeName = "configmap-volume" diff --git a/test/e2e/common/downward_api.go b/test/e2e/common/downward_api.go index 632c3df19b9..b6ac8662716 100644 --- a/test/e2e/common/downward_api.go +++ b/test/e2e/common/downward_api.go @@ -61,7 +61,7 @@ var _ = framework.KubeDescribe("Downward API", func() { testDownwardAPI(f, podName, env, expectations) }) - It("should provide pod IP as an env var", func() { + It("should provide pod IP as an env var [Conformance]", func() { podName := "downward-api-" + string(uuid.NewUUID()) env := []api.EnvVar{ { @@ -82,7 +82,7 @@ var _ = framework.KubeDescribe("Downward API", func() { testDownwardAPI(f, podName, env, expectations) }) - It("should provide container's limits.cpu/memory and requests.cpu/memory as env vars", func() { + It("should provide container's limits.cpu/memory and requests.cpu/memory as env vars [Conformance]", func() { podName := "downward-api-" + string(uuid.NewUUID()) env := []api.EnvVar{ { @@ -128,7 +128,7 @@ var _ = framework.KubeDescribe("Downward API", func() { testDownwardAPI(f, podName, env, expectations) }) - It("should provide default limits.cpu/memory from node allocatable", func() { + It("should provide default limits.cpu/memory from node allocatable [Conformance]", func() { podName := "downward-api-" + string(uuid.NewUUID()) env := []api.EnvVar{ { diff --git a/test/e2e/common/downwardapi_volume.go b/test/e2e/common/downwardapi_volume.go index 2f4e56538dd..9f3f8453d46 100644 --- a/test/e2e/common/downwardapi_volume.go +++ b/test/e2e/common/downwardapi_volume.go @@ -137,7 +137,7 @@ var _ = framework.KubeDescribe("Downward API volume", func() { podLogTimeout, framework.Poll).Should(ContainSubstring("builder=\"foo\"\n")) }) - It("should provide container's cpu limit", func() { + It("should provide container's cpu limit [Conformance]", func() { podName := "downwardapi-volume-" + string(uuid.NewUUID()) pod := downwardAPIVolumeForContainerResources(podName, "/etc/cpu_limit") @@ -146,7 +146,7 @@ var _ = framework.KubeDescribe("Downward API volume", func() { }) }) - It("should provide container's memory limit", func() { + It("should provide container's memory limit [Conformance]", func() { podName := "downwardapi-volume-" + string(uuid.NewUUID()) pod := downwardAPIVolumeForContainerResources(podName, "/etc/memory_limit") @@ -155,7 +155,7 @@ var _ = framework.KubeDescribe("Downward API volume", func() { }) }) - It("should provide container's cpu request", func() { + It("should provide container's cpu request [Conformance]", func() { podName := "downwardapi-volume-" + string(uuid.NewUUID()) pod := downwardAPIVolumeForContainerResources(podName, "/etc/cpu_request") @@ -164,7 +164,7 @@ var _ = framework.KubeDescribe("Downward API volume", func() { }) }) - It("should provide container's memory request", func() { + It("should provide container's memory request [Conformance]", func() { podName := "downwardapi-volume-" + string(uuid.NewUUID()) pod := downwardAPIVolumeForContainerResources(podName, "/etc/memory_request") @@ -173,14 +173,14 @@ var _ = framework.KubeDescribe("Downward API volume", func() { }) }) - It("should provide node allocatable (cpu) as default cpu limit if the limit is not set", func() { + It("should provide node allocatable (cpu) as default cpu limit if the limit is not set [Conformance]", func() { podName := "downwardapi-volume-" + string(uuid.NewUUID()) pod := downwardAPIVolumeForDefaultContainerResources(podName, "/etc/cpu_limit") f.TestContainerOutputRegexp("downward API volume plugin", pod, 0, []string{"[1-9]"}) }) - It("should provide node allocatable (memory) as default memory limit if the limit is not set", func() { + It("should provide node allocatable (memory) as default memory limit if the limit is not set [Conformance]", func() { podName := "downwardapi-volume-" + string(uuid.NewUUID()) pod := downwardAPIVolumeForDefaultContainerResources(podName, "/etc/memory_limit") diff --git a/test/e2e/common/kubelet_etc_hosts.go b/test/e2e/common/kubelet_etc_hosts.go index 871b0b401ad..49715695d0a 100644 --- a/test/e2e/common/kubelet_etc_hosts.go +++ b/test/e2e/common/kubelet_etc_hosts.go @@ -45,7 +45,7 @@ var _ = framework.KubeDescribe("KubeletManagedEtcHosts", func() { f: f, } - It("should test kubelet managed /etc/hosts file", func() { + It("should test kubelet managed /etc/hosts file [Conformance]", func() { By("Setting up the test") config.setup() diff --git a/test/e2e_node/kubelet_test.go b/test/e2e_node/kubelet_test.go index cc150e7aab2..734f4d18507 100644 --- a/test/e2e_node/kubelet_test.go +++ b/test/e2e_node/kubelet_test.go @@ -38,7 +38,7 @@ var _ = framework.KubeDescribe("Kubelet", func() { }) Context("when scheduling a busybox command in a pod", func() { podName := "busybox-scheduling-" + string(uuid.NewUUID()) - It("it should print the output to logs", func() { + It("it should print the output to logs [Conformance]", func() { podClient.CreateSync(&api.Pod{ ObjectMeta: api.ObjectMeta{ Name: podName, @@ -118,7 +118,7 @@ var _ = framework.KubeDescribe("Kubelet", func() { }) Context("when scheduling a read only busybox container", func() { podName := "busybox-readonly-fs" + string(uuid.NewUUID()) - It("it should not write to root filesystem", func() { + It("it should not write to root filesystem [Conformance]", func() { isReadOnly := true podClient.CreateSync(&api.Pod{ ObjectMeta: api.ObjectMeta{ diff --git a/test/e2e_node/lifecycle_hook_test.go b/test/e2e_node/lifecycle_hook_test.go index b09ba102f8c..0b11a49314d 100644 --- a/test/e2e_node/lifecycle_hook_test.go +++ b/test/e2e_node/lifecycle_hook_test.go @@ -71,7 +71,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { }) Context("when it is exec hook", func() { - It("should execute poststart exec hook properly", func() { + It("should execute poststart exec hook properly [Conformance]", func() { podWithHook := getLifecycleHookTestPod("pod-with-poststart-exec-hook", // Block forever []string{"tail", "-f", "/dev/null"}, @@ -84,7 +84,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { testPodWithHook(podWithHook) }) - It("should execute prestop exec hook properly", func() { + It("should execute prestop exec hook properly [Conformance]", func() { podWithHook := getLifecycleHookTestPod("pod-with-prestop-exec-hook", // Block forever []string{"tail", "-f", "/dev/null"}, @@ -117,7 +117,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { podHandleHookRequest = podClient.CreateSync(podHandleHookRequest) targetIP = podHandleHookRequest.Status.PodIP }) - It("should execute poststart http hook properly", func() { + It("should execute poststart http hook properly [Conformance]", func() { podWithHook := getLifecycleHookTestPod("pod-with-poststart-http-hook", // Block forever []string{"tail", "-f", "/dev/null"}, @@ -132,7 +132,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { } testPodWithHook(podWithHook) }) - It("should execute prestop http hook properly", func() { + It("should execute prestop http hook properly [Conformance]", func() { podWithHook := getLifecycleHookTestPod("pod-with-prestop-http-hook", // Block forever []string{"tail", "-f", "/dev/null"}, diff --git a/test/e2e_node/mirror_pod_test.go b/test/e2e_node/mirror_pod_test.go index 9d42858a5a4..db2c1dd9d2d 100644 --- a/test/e2e_node/mirror_pod_test.go +++ b/test/e2e_node/mirror_pod_test.go @@ -53,7 +53,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() { return checkMirrorPodRunning(f.ClientSet, mirrorPodName, ns) }, 2*time.Minute, time.Second*4).Should(BeNil()) }) - It("should be updated when static pod updated", func() { + It("should be updated when static pod updated [Conformance]", func() { By("get mirror pod uid") pod, err := f.ClientSet.Core().Pods(ns).Get(mirrorPodName) Expect(err).ShouldNot(HaveOccurred()) @@ -75,7 +75,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() { Expect(len(pod.Spec.Containers)).Should(Equal(1)) Expect(pod.Spec.Containers[0].Image).Should(Equal(image)) }) - It("should be recreated when mirror pod gracefully deleted", func() { + It("should be recreated when mirror pod gracefully deleted [Conformance]", func() { By("get mirror pod uid") pod, err := f.ClientSet.Core().Pods(ns).Get(mirrorPodName) Expect(err).ShouldNot(HaveOccurred()) @@ -90,7 +90,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() { return checkMirrorPodRecreatedAndRunnig(f.ClientSet, mirrorPodName, ns, uid) }, 2*time.Minute, time.Second*4).Should(BeNil()) }) - It("should be recreated when mirror pod forcibly deleted", func() { + It("should be recreated when mirror pod forcibly deleted [Conformance]", func() { By("get mirror pod uid") pod, err := f.ClientSet.Core().Pods(ns).Get(mirrorPodName) Expect(err).ShouldNot(HaveOccurred()) diff --git a/test/e2e_node/runtime_conformance_test.go b/test/e2e_node/runtime_conformance_test.go index 08d6dc888ba..00698016695 100644 --- a/test/e2e_node/runtime_conformance_test.go +++ b/test/e2e_node/runtime_conformance_test.go @@ -234,7 +234,7 @@ while true; do sleep 1; done }, } { testCase := testCase - It(testCase.description, func() { + It(testCase.description+" [Conformance]", func() { name := "image-pull-test" command := []string{"/bin/sh", "-c", "while true; do sleep 1; done"} container := ConformanceContainer{