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

This is a combination of 2 commits.

Browse Source 
Fix log messages and var names in integr test

It says "pods" where the things are actually "containers".
This commit is contained in:
Eric Tune 2015-03-11 15:34:41 -07:00
parent 07c2035630
commit cf22810ffc
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/integration/integration.go
View File

@ -763,29 +763,29 @@ func main() {
} }
wg.Wait() wg.Wait()
// Check that kubelet tried to make the pods. // Check that kubelet tried to make the containers.
// Using a set to list unique creation attempts. Our fake is // Using a set to list unique creation attempts. Our fake is
// really stupid, so kubelet tries to create these multiple times. // really stupid, so kubelet tries to create these multiple times.
createdPods := util.StringSet{} createdConts := util.StringSet{}
for _, p := range fakeDocker1.Created { for _, p := range fakeDocker1.Created {
// The last 8 characters are random, so slice them off. // The last 8 characters are random, so slice them off.
if n := len(p); n > 8 { if n := len(p); n > 8 {
createdPods.Insert(p[:n-8]) createdConts.Insert(p[:n-8])
} }
} }
for _, p := range fakeDocker2.Created { for _, p := range fakeDocker2.Created {
// The last 8 characters are random, so slice them off. // The last 8 characters are random, so slice them off.
if n := len(p); n > 8 { if n := len(p); n > 8 {
createdPods.Insert(p[:n-8]) createdConts.Insert(p[:n-8])
} }
} }
// We expect 9: 2 pod infra containers + 2 pods from the replication controller + // We expect 9: 2 infra containers + 2 containers from the replication controller +
// 1 pod infra container + 2 pods from the URL + // 1 infra container + 2 containers from the URL +
// 1 pod infra container + 1 pod from the service test. // 1 infra container + 1 container from the service test.
if len(createdPods) != 9 { if len(createdConts) != 9 {
glog.Fatalf("Expected 9 pods; got %v\n\nlist of created pods:\n\n%#v\n\nDocker 1 Created:\n\n%#v\n\nDocker 2 Created:\n\n%#v\n\n", len(createdPods), createdPods.List(), fakeDocker1.Created, fakeDocker2.Created) glog.Fatalf("Expected 9 containers; got %v\n\nlist of created containers:\n\n%#v\n\nDocker 1 Created:\n\n%#v\n\nDocker 2 Created:\n\n%#v\n\n", len(createdConts), createdConts.List(), fakeDocker1.Created, fakeDocker2.Created)
} }
glog.Infof("OK - found created pods: %#v", createdPods.List()) glog.Infof("OK - found created containers: %#v", createdConts.List())
} }
// ServeCachedManifestFile serves a file for kubelet to read. // ServeCachedManifestFile serves a file for kubelet to read.