github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

service.go e2e: Cleanup ELBs from previous runs

Browse Source 
Prior to attempting to create new ones, cleanup from previous runs.
Timeouts, 500s, etc. are possible here, and if they happen, you don't
want to die forever.

Along the way: Remove the timeout, it was clearly copied from the
previous function and is actually an anti-pattern that needs to be
fixed after discovering it doesn't play well with defers.

Fixes #5722
This commit is contained in:
Zach Loafman 2015-03-20 14:04:41 -07:00
parent 7f02e110f4
commit 4ab3852685
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/service.go
View File

@ -245,7 +245,8 @@ var _ = Describe("Services", func() {
close(done)
}()
}, 240.0)
It("should correctly serve identically named services in different namespaces on different external IP addresses", func(done Done) {
It("should correctly serve identically named services in different namespaces on different external IP addresses", func() {
serviceNames := []string{"services-namespace-test0"} // Could add more here, but then it takes longer.
namespaces := []string{"namespace0", "namespace1"} // As above.
labels := map[string]string{
@ -261,11 +262,16 @@ var _ = Describe("Services", func() {
CreateExternalLoadBalancer: true,
},
}
// Always delete any turds from a previous run.
for _, namespace := range namespaces {
for _, serviceName := range serviceNames {
By("cleanup previous service " + serviceName + " in namespace " + namespace)
c.Services(namespace).Delete(serviceName)
}
}
publicIPs := []string{}
// We defer Gingko pieces that may Fail, so clean up at the end.
defer func() {
close(done)
}()
for _, namespace := range namespaces {
for _, serviceName := range serviceNames {
service.ObjectMeta.Name = serviceName
@ -282,7 +288,7 @@ var _ = Describe("Services", func() {
}
}
validateUniqueOrFail(publicIPs)
}, 240.0)
})
})
func validateUniqueOrFail(s []string) {