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

Move remaining tests in e2e/service.go to unique namespaces. #6847

Merged
merged 1 commit into from Apr 15, 2015
Merged

Move remaining tests in e2e/service.go to unique namespaces. #6847

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
14 changes: 7 additions & 7 deletions test/e2e/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var _ = Describe("Services", func() {
return
}

podClient := c.Pods(api.NamespaceDefault)
podClient := c.Pods(namespace0)

//TODO: Wait for skyDNS

Expand Down Expand Up @@ -125,7 +125,7 @@ var _ = Describe("Services", func() {
Failf("Failed to create %s pod: %v", pod.Name, err)
}

expectNoError(waitForPodRunning(c, pod.Name))
expectNoError(waitForPodRunningInNamespace(c, pod.Name, namespace0))

By("retrieving the pod")
pod, err := podClient.Get(pod.Name)
Expand All @@ -142,7 +142,7 @@ var _ = Describe("Services", func() {
_, err := c.Get().
Prefix("proxy").
Resource("pods").
Namespace(api.NamespaceDefault).
Namespace(namespace0).
Name(pod.Name).
Suffix("results", name).
Do().Raw()
Expand Down Expand Up @@ -188,7 +188,7 @@ var _ = Describe("Services", func() {

It("should serve a basic endpoint from pods", func(done Done) {
serviceName := "endpoint-test2"
ns := api.NamespaceDefault
ns := namespace0
labels := map[string]string{
"foo": "bar",
"baz": "blah",
Expand Down Expand Up @@ -257,7 +257,7 @@ var _ = Describe("Services", func() {

It("should be able to create a functioning external load balancer", func() {
serviceName := "external-lb-test"
ns := api.NamespaceDefault
ns := namespace0
labels := map[string]string{
"key0": "value0",
}
Expand Down Expand Up @@ -317,7 +317,7 @@ var _ = Describe("Services", func() {
}

By("creating pod to be part of service " + serviceName)
podClient := c.Pods(api.NamespaceDefault)
podClient := c.Pods(ns)
defer func() {
By("deleting pod " + pod.Name)
defer GinkgoRecover()
Expand All @@ -326,7 +326,7 @@ var _ = Describe("Services", func() {
if _, err := podClient.Create(pod); err != nil {
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")
var resp *http.Response
Expand Down