Merge pull request #11 from camptocamp/wait_pull

Wait for the pull to be completed before continuing

.gitignore

@@ -0,0 +1,2 @@
+upkick
+upkick.1

handler/handler.go

@@ -3,6 +3,7 @@ package handler
 import (
 	"context"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -132,12 +133,17 @@ func (u *Upkick) GetImages() (images map[string]*image.Image, err error) {
 func (u *Upkick) Pull(i *image.Image) (err error) {
 	log.Debugf("Pulling Image %s", i)
 
-	_, err = u.Client.ImagePull(context.Background(), i.ID, types.ImagePullOptions{})
+	var pullOut io.ReadCloser
+	pullOut, err = u.Client.ImagePull(context.Background(), i.ID, types.ImagePullOptions{})
 	if err != nil {
 		msg := fmt.Sprintf("failed to pull image %s", i.ID)
 		return errors.Wrap(err, msg)
 	}
 
+	// Wait for the image to be fully pulled
+	io.Copy(ioutil.Discard, pullOut);
+	pullOut.Close()
+
 	img, _, err := u.Client.ImageInspectWithRaw(context.Background(), i.ID)
 	if err != nil {
 		msg := fmt.Sprintf("failed to inspect image %s", i.ID)

metrics/metrics_test.go

@@ -12,8 +12,9 @@ func TestEventString(t *testing.T) {
 		Value: "bar",
 	}
 	expected := "foo{volume=\"baz\",instance=\"qux\"} bar"
-	if e.String() != expected {
-		t.Fatalf("Expected %s, got %s", expected, e.String())
+	expected2 := "foo{instance=\"qux\", volume=\"baz\"} bar"
+	if e.String() != expected && e.String() != expected2 {
+		t.Fatalf("Expected <%s>, got <%s>", expected, e.String())
 	}
 }