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

Merge pull request #6902 from GoogleCloudPlatform/revert-6847-2015-04-14-namespace-for-services-e2e

Browse Source 
Revert "Move remaining tests in e2e/service.go to unique namespaces."
This commit is contained in:
Quinton Hoole 2015-04-16 04:10:32 -07:00
commit 7581944aec
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/service.go
View File

@ -52,7 +52,7 @@ var _ = Describe("Services", func() {
return return
} }
podClient := c.Pods(namespace0) podClient := c.Pods(api.NamespaceDefault)
//TODO: Wait for skyDNS //TODO: Wait for skyDNS
@ -125,7 +125,7 @@ var _ = Describe("Services", func() {
Failf("Failed to create %s pod: %v", pod.Name, err) Failf("Failed to create %s pod: %v", pod.Name, err)
} }
expectNoError(waitForPodRunningInNamespace(c, pod.Name, namespace0)) expectNoError(waitForPodRunning(c, pod.Name))
By("retrieving the pod") By("retrieving the pod")
pod, err := podClient.Get(pod.Name) pod, err := podClient.Get(pod.Name)
@ -142,7 +142,7 @@ var _ = Describe("Services", func() {
_, err := c.Get(). _, err := c.Get().
Prefix("proxy"). Prefix("proxy").
Resource("pods"). Resource("pods").
Namespace(namespace0). Namespace(api.NamespaceDefault).
Name(pod.Name). Name(pod.Name).
Suffix("results", name). Suffix("results", name).
Do().Raw() Do().Raw()
@ -188,7 +188,7 @@ var _ = Describe("Services", func() {
It("should serve a basic endpoint from pods", func(done Done) { It("should serve a basic endpoint from pods", func(done Done) {
serviceName := "endpoint-test2" serviceName := "endpoint-test2"
ns := namespace0 ns := api.NamespaceDefault
labels := map[string]string{ labels := map[string]string{
"foo": "bar", "foo": "bar",
"baz": "blah", "baz": "blah",
@ -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 := namespace0 ns := api.NamespaceDefault
labels := map[string]string{ labels := map[string]string{
"key0": "value0", "key0": "value0",
} }
@ -317,7 +317,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(ns) podClient := c.Pods(api.NamespaceDefault)
defer func() { defer func() {
By("deleting pod " + pod.Name) By("deleting pod " + pod.Name)
defer GinkgoRecover() defer GinkgoRecover()
@ -326,7 +326,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(waitForPodRunningInNamespace(c, pod.Name, ns)) expectNoError(waitForPodRunning(c, pod.Name))
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