From 8df355b80a931cb447fda2f9f2162bd51f5d1942 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Mon, 22 Feb 2021 19:40:30 +0100 Subject: [PATCH] Replace some nested KubeDescribe calls with ginkgo.Describe --- test/conformance/testdata/conformance.yaml | 16 ++++++++-------- test/e2e/apps/network_partition.go | 10 +++++----- test/e2e/apps/statefulset.go | 4 ++-- test/e2e/node/pods.go | 8 ++++---- test/e2e/storage/volume_provisioning.go | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 587c5048ddf..8125fa09bcb 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -635,8 +635,8 @@ release: v1.19 file: test/e2e/common/podtemplates.go - testname: Pods, QOS - codename: '[k8s.io] [sig-node] Pods Extended [k8s.io] Pods Set QOS Class should - be set on Pods with matching resource requests and limits for memory and cpu [Conformance]' + codename: '[k8s.io] [sig-node] Pods Extended Pods Set QOS Class should be set on + Pods with matching resource requests and limits for memory and cpu [Conformance]' description: Create a Pod with CPU and Memory request and limits. Pod status MUST have QOSClass set to PodQOSGuaranteed. release: v1.9 @@ -2190,7 +2190,7 @@ release: v1.20 file: test/e2e/apps/rc.go - testname: StatefulSet, Burst Scaling - codename: '[sig-apps] StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] + codename: '[sig-apps] StatefulSet Basic StatefulSet functionality [StatefulSetBasic] Burst scaling should run to completion even with unhealthy pods [Slow] [Conformance]' description: StatefulSet MUST support the Parallel PodManagementPolicy for burst scaling. This test does not depend on a preexisting default StorageClass or a @@ -2198,7 +2198,7 @@ release: v1.9 file: test/e2e/apps/statefulset.go - testname: StatefulSet, Scaling - codename: '[sig-apps] StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] + codename: '[sig-apps] StatefulSet Basic StatefulSet functionality [StatefulSetBasic] Scaling should happen in predictable order and halt if any stateful pod is unhealthy [Slow] [Conformance]' description: StatefulSet MUST create Pods in ascending order by ordinal index when @@ -2208,7 +2208,7 @@ release: v1.9 file: test/e2e/apps/statefulset.go - testname: StatefulSet, Recreate Failed Pod - codename: '[sig-apps] StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] + codename: '[sig-apps] StatefulSet Basic StatefulSet functionality [StatefulSetBasic] Should recreate evicted statefulset [Conformance]' description: StatefulSet MUST delete and recreate Pods it owns that go into a Failed state, such as when they are rejected or evicted by a Node. This test does not @@ -2216,7 +2216,7 @@ release: v1.9 file: test/e2e/apps/statefulset.go - testname: StatefulSet resource Replica scaling - codename: '[sig-apps] StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] + codename: '[sig-apps] StatefulSet Basic StatefulSet functionality [StatefulSetBasic] should have a working scale subresource [Conformance]' description: Create a StatefulSet resource. Newly created StatefulSet resource MUST have a scale of one. Bring the scale of the StatefulSet resource up to two. StatefulSet @@ -2224,7 +2224,7 @@ release: v1.16, v1.21 file: test/e2e/apps/statefulset.go - testname: StatefulSet, Rolling Update with Partition - codename: '[sig-apps] StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] + codename: '[sig-apps] StatefulSet Basic StatefulSet functionality [StatefulSetBasic] should perform canary updates and phased rolling updates of template modifications [Conformance]' description: StatefulSet's RollingUpdate strategy MUST support the Partition parameter @@ -2234,7 +2234,7 @@ release: v1.9 file: test/e2e/apps/statefulset.go - testname: StatefulSet, Rolling Update - codename: '[sig-apps] StatefulSet [k8s.io] Basic StatefulSet functionality [StatefulSetBasic] + codename: '[sig-apps] StatefulSet Basic StatefulSet functionality [StatefulSetBasic] should perform rolling updates and roll backs of template modifications [Conformance]' description: StatefulSet MUST support the RollingUpdate strategy to automatically replace Pods one at a time when the Pod template changes. The StatefulSet's status diff --git a/test/e2e/apps/network_partition.go b/test/e2e/apps/network_partition.go index df1bade03a8..d1fc2a47a5b 100644 --- a/test/e2e/apps/network_partition.go +++ b/test/e2e/apps/network_partition.go @@ -127,7 +127,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() { } }) - framework.KubeDescribe("Pods", func() { + ginkgo.Describe("Pods", func() { ginkgo.Context("should return to running and ready state after network partition is healed", func() { ginkgo.BeforeEach(func() { e2eskipper.SkipUnlessNodeCountIsAtLeast(2) @@ -237,7 +237,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() { }) }) - framework.KubeDescribe("[ReplicationController]", func() { + ginkgo.Describe("[ReplicationController]", func() { ginkgo.It("should recreate pods scheduled on the unreachable node "+ "AND allow scheduling of pods on a node after it rejoins the cluster", func() { e2eskipper.SkipUnlessSSHKeyPresent() @@ -355,7 +355,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() { }) }) - framework.KubeDescribe("[StatefulSet]", func() { + ginkgo.Describe("[StatefulSet]", func() { psName := "ss" labels := map[string]string{ "foo": "bar", @@ -430,7 +430,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() { }) }) - framework.KubeDescribe("[Job]", func() { + ginkgo.Describe("[Job]", func() { ginkgo.It("should create new pods when node is partitioned", func() { e2eskipper.SkipUnlessSSHKeyPresent() @@ -477,7 +477,7 @@ var _ = SIGDescribe("Network Partition [Disruptive] [Slow]", func() { }) }) - framework.KubeDescribe("Pods", func() { + ginkgo.Describe("Pods", func() { ginkgo.Context("should be evicted from unready Node", func() { ginkgo.BeforeEach(func() { e2eskipper.SkipUnlessNodeCountIsAtLeast(2) diff --git a/test/e2e/apps/statefulset.go b/test/e2e/apps/statefulset.go index fae7c7fa7c8..69dfb961d4f 100644 --- a/test/e2e/apps/statefulset.go +++ b/test/e2e/apps/statefulset.go @@ -92,7 +92,7 @@ var _ = SIGDescribe("StatefulSet", func() { ns = f.Namespace.Name }) - framework.KubeDescribe("Basic StatefulSet functionality [StatefulSetBasic]", func() { + ginkgo.Describe("Basic StatefulSet functionality [StatefulSetBasic]", func() { ssName := "ss" labels := map[string]string{ "foo": "bar", @@ -891,7 +891,7 @@ var _ = SIGDescribe("StatefulSet", func() { }) }) - framework.KubeDescribe("Deploy clustered applications [Feature:StatefulSet] [Slow]", func() { + ginkgo.Describe("Deploy clustered applications [Feature:StatefulSet] [Slow]", func() { var appTester *clusterAppTester ginkgo.BeforeEach(func() { diff --git a/test/e2e/node/pods.go b/test/e2e/node/pods.go index 6d65eafa574..39896921d29 100644 --- a/test/e2e/node/pods.go +++ b/test/e2e/node/pods.go @@ -48,7 +48,7 @@ import ( var _ = SIGDescribe("Pods Extended", func() { f := framework.NewDefaultFramework("pods") - framework.KubeDescribe("Delete Grace Period", func() { + ginkgo.Describe("Delete Grace Period", func() { var podClient *framework.PodClient ginkgo.BeforeEach(func() { podClient = f.PodClient() @@ -145,7 +145,7 @@ var _ = SIGDescribe("Pods Extended", func() { }) }) - framework.KubeDescribe("Pods Set QOS Class", func() { + ginkgo.Describe("Pods Set QOS Class", func() { var podClient *framework.PodClient ginkgo.BeforeEach(func() { podClient = f.PodClient() @@ -197,7 +197,7 @@ var _ = SIGDescribe("Pods Extended", func() { }) }) - framework.KubeDescribe("Pod Container Status", func() { + ginkgo.Describe("Pod Container Status", func() { var podClient *framework.PodClient ginkgo.BeforeEach(func() { podClient = f.PodClient() @@ -441,7 +441,7 @@ var _ = SIGDescribe("Pods Extended", func() { }) - framework.KubeDescribe("Pod Container lifecycle", func() { + ginkgo.Describe("Pod Container lifecycle", func() { var podClient *framework.PodClient ginkgo.BeforeEach(func() { podClient = f.PodClient() diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go index a46de7e9db6..8874a7b2d0c 100644 --- a/test/e2e/storage/volume_provisioning.go +++ b/test/e2e/storage/volume_provisioning.go @@ -765,7 +765,7 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() { }) }) - framework.KubeDescribe("GlusterDynamicProvisioner", func() { + ginkgo.Describe("GlusterDynamicProvisioner", func() { ginkgo.It("should create and delete persistent volumes [fast]", func() { e2eskipper.SkipIfProviderIs("gke") ginkgo.By("creating a Gluster DP server Pod")