github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #785 from roberthbailey/integration

Browse Source 
Minor style fixes and keep the test manifest in sync.
This commit is contained in:
brendandburns 2014-08-05 11:05:53 -07:00
commit 634392daa5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/integration/integration.go
View File

@ -141,12 +141,12 @@ func runReplicationControllerTest(kubeClient *client.Client) {
glog.Fatalf("Unexpected error: %#v", err)
}
var controllerRequest api.ReplicationController
if err = json.Unmarshal(data, &controllerRequest); err != nil {
if err := json.Unmarshal(data, &controllerRequest); err != nil {
glog.Fatalf("Unexpected error: %#v", err)
}
glog.Infof("Creating replication controllers")
if _, err = kubeClient.CreateReplicationController(controllerRequest); err != nil {
if _, err := kubeClient.CreateReplicationController(controllerRequest); err != nil {
glog.Fatalf("Unexpected error: %#v", err)
}
glog.Infof("Done creating replication controllers")
@ -230,8 +230,7 @@ func runAtomicPutTest(c *client.Client) {
}(label, value)
}
wg.Wait()
err = c.Get().Path("services").Path(svc.ID).Do().Into(&svc)
if err != nil {
if err := c.Get().Path("services").Path(svc.ID).Do().Into(&svc); err != nil {
glog.Fatalf("Failed getting atomicService after writers are complete: %v", err)
}
if !reflect.DeepEqual(testLabels, labels.Set(svc.Selector)) {
@ -321,8 +320,8 @@ func ServeCachedManifestFile() (servingAddress string) {
const (
// This is copied from, and should be kept in sync with:
// https://raw.githubusercontent.com/GoogleCloudPlatform/container-vm-guestbook-redis-python/master/manifest.yaml
testManifestFile = `version: v1beta1
id: web-test
testManifestFile = `version: v1beta2
id: container-vm-guestbook
containers:
- name: redis
image: dockerfile/redis