From b3550bcacfaa2543e72c9a167c94ac6633b1b40a Mon Sep 17 00:00:00 2001 From: Brian Grant Date: Tue, 2 Jun 2015 20:16:41 -0700 Subject: [PATCH] Revert "Cleanup ginkgo declarative naming in E2Es" --- test/e2e/empty_dir.go | 2 +- test/e2e/kubectl.go | 8 ++++---- test/e2e/load.go | 2 +- test/e2e/monitoring.go | 2 +- test/e2e/networking.go | 4 ++-- test/e2e/pd.go | 2 +- test/e2e/shell.go | 2 +- test/e2e/volumes.go | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/e2e/empty_dir.go b/test/e2e/empty_dir.go index 0158c082e81..0d7cdd7476b 100644 --- a/test/e2e/empty_dir.go +++ b/test/e2e/empty_dir.go @@ -27,7 +27,7 @@ import ( . "github.com/onsi/ginkgo" ) -var _ = Describe("EmptyDir volumes", func() { +var _ = Describe("emptyDir", func() { f := NewFramework("emptydir") It("volume on tmpfs should have the correct mode", func() { diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 6a809801c55..e6d069f417b 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -44,7 +44,7 @@ const ( guestbookResponseTimeout = 3 * time.Minute ) -var _ = Describe("Kubectl client", func() { +var _ = Describe("kubectl", func() { defer GinkgoRecover() var c *client.Client var ns string @@ -53,7 +53,7 @@ var _ = Describe("Kubectl client", func() { var err error c, err = loadClient() expectNoError(err) - testingNs, err = createTestingNS("Kubectl client", c) + testingNs, err = createTestingNS("kubectl", c) ns = testingNs.Name Expect(err).NotTo(HaveOccurred()) }) @@ -65,7 +65,7 @@ var _ = Describe("Kubectl client", func() { } }) - Describe("Update Demo", func() { + Describe("update-demo", func() { var updateDemoRoot, nautilusPath, kittenPath string BeforeEach(func() { updateDemoRoot = filepath.Join(testContext.RepoRoot, "examples/update-demo") @@ -106,7 +106,7 @@ var _ = Describe("Kubectl client", func() { }) }) - Describe("Guestbook application", func() { + Describe("guestbook", func() { var guestbookPath string BeforeEach(func() { guestbookPath = filepath.Join(testContext.RepoRoot, "examples/guestbook") diff --git a/test/e2e/load.go b/test/e2e/load.go index fe685cf85e7..e90fcc67dc2 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -44,7 +44,7 @@ const ( // the ginkgo.skip list (see driver.go). // To run this suite you must explicitly ask for it by setting the // -t/--test flag or ginkgo.focus flag. -var _ = Describe("Load capacity", func() { +var _ = Describe("Load", func() { var c *client.Client var nodeCount int var ns string diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index 08d6a9ad8ef..93574b47f74 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -41,7 +41,7 @@ var _ = Describe("Monitoring", func() { expectNoError(err) }) - It("should verify monitoring pods and all cluster nodes are available on influxdb using heapster.", func() { + It("verify monitoring pods and all cluster nodes are available on influxdb using heapster.", func() { if !providerIs("gce") { By(fmt.Sprintf("Skipping Monitoring test, which is only supported for provider gce (not %s)", testContext.Provider)) diff --git a/test/e2e/networking.go b/test/e2e/networking.go index 375642d8d80..e762a820e76 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -31,7 +31,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = Describe("New networking", func() { +var _ = Describe("NetworkingNew", func() { f := NewFramework("nettestnew") var svcname = "nettest" @@ -244,7 +244,7 @@ func LaunchNetTestPodPerNode(f *Framework, nodes *api.NodeList, name, version st return podNames } -var _ = Describe("Old networking", func() { +var _ = Describe("Networking", func() { f := NewFramework("nettest") var svcname = "nettest" diff --git a/test/e2e/pd.go b/test/e2e/pd.go index b0502be979b..d396d44665d 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -33,7 +33,7 @@ import ( . "github.com/onsi/gomega" ) -var _ = Describe("Pod Disks", func() { +var _ = Describe("PD", func() { var ( c *client.Client podClient client.PodInterface diff --git a/test/e2e/shell.go b/test/e2e/shell.go index 5598088d789..9ec857d9772 100644 --- a/test/e2e/shell.go +++ b/test/e2e/shell.go @@ -28,7 +28,7 @@ import ( var _ = Describe("Shell", func() { defer GinkgoRecover() - It(fmt.Sprintf("should pass tests for services.sh"), func() { + It(fmt.Sprintf("tests that services.sh passes"), func() { // The services script only works on gce/gke if !providerIs("gce", "gke") { By(fmt.Sprintf("Skipping Shell test services.sh, which is only supported for provider gce and gke (not %s)", diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index 29e5f69f70e..1045126c2cb 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -192,7 +192,7 @@ func testVolumeClient(client *client.Client, config VolumeTestConfig, volume api Expect(body).To(ContainSubstring(expectedContent)) } -var _ = Describe("Volumes", func() { +var _ = Describe("Volume", func() { clean := true // If 'false', the test won't clear its namespace (and pods and services) upon completion. Useful for debugging. // filled in BeforeEach