Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Cleanup ginkgo declarative naming in E2Es" #9166

Merged
merged 1 commit into from
Jun 3, 2015
Merged

Revert "Cleanup ginkgo declarative naming in E2Es" #9166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/e2e/empty_dir.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/kubectl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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())
})
Expand All @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/networking.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
. "github.com/onsi/gomega"
)

var _ = Describe("New networking", func() {
var _ = Describe("NetworkingNew", func() {
f := NewFramework("nettestnew")

var svcname = "nettest"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/pd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/volumes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down