github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7142 from a-robinson/ns 

Update the external load balancer test to use a different namespace in each run
pull/6/head
Alex Robinson 2015-04-21 17:22:05 -07:00
parent a666c1e731 a9902fe932
commit 0c8ee980d7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/service.go
View File

@ -257,7 +257,7 @@ var _ = Describe("Services", func() {
It("should be able to create a functioning external load balancer", func() { It("should be able to create a functioning external load balancer", func() {
serviceName := "external-lb-test" serviceName := "external-lb-test"
ns := api.NamespaceDefault ns := namespace0
labels := map[string]string{ labels := map[string]string{
"key0": "value0", "key0": "value0",
} }
@ -275,9 +275,6 @@ var _ = Describe("Services", func() {
}, },
} }
By("cleaning up previous service " + serviceName + " from namespace " + ns)
c.Services(ns).Delete(serviceName)
By("creating service " + serviceName + " with external load balancer in namespace " + ns) By("creating service " + serviceName + " with external load balancer in namespace " + ns)
result, err := c.Services(ns).Create(service) result, err := c.Services(ns).Create(service)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -317,7 +314,7 @@ var _ = Describe("Services", func() {
} }
By("creating pod to be part of service " + serviceName) By("creating pod to be part of service " + serviceName)
podClient := c.Pods(api.NamespaceDefault) podClient := c.Pods(ns)
defer func() { defer func() {
By("deleting pod " + pod.Name) By("deleting pod " + pod.Name)
defer GinkgoRecover() defer GinkgoRecover()
@ -326,7 +323,7 @@ var _ = Describe("Services", func() {
if _, err := podClient.Create(pod); err != nil { if _, err := podClient.Create(pod); err != nil {
Failf("Failed to create pod %s: %v", pod.Name, err) Failf("Failed to create pod %s: %v", pod.Name, err)
} }
expectNoError(waitForPodRunning(c, pod.Name)) expectNoError(waitForPodRunningInNamespace(c, pod.Name, ns))
By("hitting the pod through the service's external load balancer") By("hitting the pod through the service's external load balancer")
var resp *http.Response var resp *http.Response