github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9839 from lavalamp/logSpam

Browse Source 
remove broken ginkgo Done concept from tests
This commit is contained in:
Saad Ali 2015-06-16 15:50:11 -07:00
commit 418ab026c3
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/service.go
View File

@ -72,7 +72,7 @@ var _ = Describe("Services", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
It("should serve a basic endpoint from pods", func(done Done) { It("should serve a basic endpoint from pods", func() {
serviceName := "endpoint-test2" serviceName := "endpoint-test2"
ns := namespaces[0] ns := namespaces[0]
labels := map[string]string{ labels := map[string]string{
@ -133,14 +133,9 @@ var _ = Describe("Services", func() {
names = []string{} names = []string{}
validateEndpointsOrFail(c, ns, serviceName, map[string][]int{}) validateEndpointsOrFail(c, ns, serviceName, map[string][]int{})
})
// We deferred Gingko pieces that may Fail, we aren't done. It("should serve multiport endpoints from pods", func() {
defer func() {
close(done)
}()
}, 240.0)
It("should serve multiport endpoints from pods", func(done Done) {
// repacking functionality is intentionally not tested here - it's better to test it in an integration test. // repacking functionality is intentionally not tested here - it's better to test it in an integration test.
serviceName := "multi-endpoint-test" serviceName := "multi-endpoint-test"
ns := namespaces[0] ns := namespaces[0]
@ -234,12 +229,7 @@ var _ = Describe("Services", func() {
names = []string{} names = []string{}
validateEndpointsOrFail(c, ns, serviceName, map[string][]int{}) validateEndpointsOrFail(c, ns, serviceName, map[string][]int{})
})
// We deferred Gingko pieces that may Fail, we aren't done.
defer func() {
close(done)
}()
}, 240.0)
It("should be able to create a functioning external load balancer", func() { It("should be able to create a functioning external load balancer", func() {
if !providerIs("gce", "gke", "aws") { if !providerIs("gce", "gke", "aws") {