From 3a12acee59a42c741bcf1c5ffab14025df09a8cd Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Sun, 13 Aug 2017 17:04:52 +0800 Subject: [PATCH] Removes redundant prefix in cluster-lifecycle e2e test names --- test/e2e/lifecycle/cluster_upgrade.go | 12 ++++++------ test/e2e/lifecycle/resize_nodes.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/e2e/lifecycle/cluster_upgrade.go b/test/e2e/lifecycle/cluster_upgrade.go index d3efc6629b3..10917d52c33 100644 --- a/test/e2e/lifecycle/cluster_upgrade.go +++ b/test/e2e/lifecycle/cluster_upgrade.go @@ -59,13 +59,13 @@ var statefulsetUpgradeTests = []upgrades.Test{ &upgrades.CassandraUpgradeTest{}, } -var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() { +var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() { f := framework.NewDefaultFramework("cluster-upgrade") // Create the frameworks here because we can only create them // in a "Describe". testFrameworks := createUpgradeFrameworks(upgradeTests) - SIGDescribe("master upgrade", func() { + Describe("master upgrade", func() { It("should maintain a functioning cluster [Feature:MasterUpgrade]", func() { upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), framework.TestContext.UpgradeTarget) framework.ExpectNoError(err) @@ -88,7 +88,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() { }) }) - SIGDescribe("node upgrade", func() { + Describe("node upgrade", func() { It("should maintain a functioning cluster [Feature:NodeUpgrade]", func() { upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), framework.TestContext.UpgradeTarget) framework.ExpectNoError(err) @@ -110,7 +110,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() { }) }) - SIGDescribe("cluster upgrade", func() { + Describe("cluster upgrade", func() { It("should maintain a functioning cluster [Feature:ClusterUpgrade]", func() { upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), framework.TestContext.UpgradeTarget) framework.ExpectNoError(err) @@ -139,7 +139,7 @@ var _ = SIGDescribe("Downgrade [Feature:Downgrade]", func() { // in a "Describe". testFrameworks := createUpgradeFrameworks(upgradeTests) - SIGDescribe("cluster downgrade", func() { + Describe("cluster downgrade", func() { It("should maintain a functioning cluster [Feature:ClusterDowngrade]", func() { upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), framework.TestContext.UpgradeTarget) framework.ExpectNoError(err) @@ -169,7 +169,7 @@ var _ = SIGDescribe("etcd Upgrade [Feature:EtcdUpgrade]", func() { // Create the frameworks here because we can only create them // in a "Describe". testFrameworks := createUpgradeFrameworks(upgradeTests) - SIGDescribe("etcd upgrade", func() { + Describe("etcd upgrade", func() { It("should maintain a functioning cluster", func() { upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), "") framework.ExpectNoError(err) diff --git a/test/e2e/lifecycle/resize_nodes.go b/test/e2e/lifecycle/resize_nodes.go index 6f96830db9d..784f6a1a15f 100644 --- a/test/e2e/lifecycle/resize_nodes.go +++ b/test/e2e/lifecycle/resize_nodes.go @@ -64,7 +64,7 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { }) // Slow issue #13323 (8 min) - SIGDescribe("Resize [Slow]", func() { + Describe("Resize [Slow]", func() { var skipped bool BeforeEach(func() {