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

Merge pull request #5613 from satnam6502/network

Browse Source 
Make Network end to end test use a test image with a specific tag (and use a debugged image)
This commit is contained in:
Jeff Grafton 2015-03-18 16:21:30 -07:00
commit df710cdff5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/networking.go
View File

@ -59,6 +59,7 @@ var _ = Describe("Networking", func() {
name := "nettest" name := "nettest"
By(fmt.Sprintf("Creating service with name %s in namespace %s", name, ns))
svc, err := c.Services(ns).Create(&api.Service{ svc, err := c.Services(ns).Create(&api.Service{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: name, Name: name,
@ -74,7 +75,6 @@ var _ = Describe("Networking", func() {
}, },
}, },
}) })
By(fmt.Sprintf("Creating service with name %s in namespace %s", svc.Name, ns))
if err != nil { if err != nil {
Fail(fmt.Sprintf("unable to create test service %s: %v", svc.Name, err)) Fail(fmt.Sprintf("unable to create test service %s: %v", svc.Name, err))
} }
@ -108,7 +108,7 @@ var _ = Describe("Networking", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "webserver", Name: "webserver",
Image: "kubernetes/nettest:latest", Image: "kubernetes/nettest:1.1",
Command: []string{"-service=" + name, "-namespace=" + ns}, Command: []string{"-service=" + name, "-namespace=" + ns},
Ports: []api.ContainerPort{{ContainerPort: 8080}}, Ports: []api.ContainerPort{{ContainerPort: 8080}},
}, },
@ -140,7 +140,13 @@ var _ = Describe("Networking", func() {
var body []byte var body []byte
for i := 0; i < maxAttempts && !passed; i++ { for i := 0; i < maxAttempts && !passed; i++ {
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
body, err = c.Get().Namespace(ns).Prefix("proxy").Resource("services").Name(svc.Name).Suffix("status").Do().Raw() body, err = c.Get().
Namespace(ns).
Prefix("proxy").
Resource("services").
Name(svc.Name).
Suffix("status").
Do().Raw()
if err != nil { if err != nil {
fmt.Printf("Attempt %v/%v: service/pod still starting. (error: '%v')\n", i, maxAttempts, err) fmt.Printf("Attempt %v/%v: service/pod still starting. (error: '%v')\n", i, maxAttempts, err)
continue continue