Merge pull request #12 from deliveroo/RP-XXX/get-tests-passing

[RP-XXX] Get tests passing on go 1.10.1

cli/pipeline/pipeline_definition_test.go

@@ -13,7 +13,7 @@ func TestParsePipeline(t *testing.T) {
 	pipeline := parsePipeline(data)
 
 	if len(pipeline.Steps) != 2 {
-		t.Errorf("excepted two steps, got %i", len(pipeline.Steps))
+		t.Errorf("excepted two steps, got %d", len(pipeline.Steps))
 	}
 
 	if pipeline.Bucket != "canoe-sample-pipeline" {

cli/pipeline/run_test.go

@@ -207,7 +207,7 @@ func TestRunPipelineStartTimeout(t *testing.T) {
 	if len(errors) != 2 {
 		t.Errorf("excepted two errors, actual %v", len(errors))
 	}
-	msg := "[paddle] [Timeout waiting for pod to start. Cluster might not have sufficient resources.]"
+	msg := "[paddle] [Timed out waiting for pod to start. Cluster might not have sufficient resources.]"
 	for _, err := range errors {
 		if err != msg {
 			t.Errorf("Expected timeout error, got %s", err)

cli/pipeline/watch.go

@@ -122,7 +122,7 @@ func Watch(ctx context.Context, c kubernetes.Interface, watchPod *v1.Pod) (<-cha
 					parsePodStatus(pod)
 				} else {
 					if err != nil {
-						log.Println("Error polling pod status: %s", err.Error())
+						log.Printf("Error polling pod status: %s\n", err.Error())
 					} else {
 						log.Println("No pod status")
 					}

cli/pipeline/watch_test.go

@@ -52,12 +52,12 @@ func TestWatch(t *testing.T) {
 	types := []WatchEventType{Added, Added, Completed, Removed, Failed}
 
 	if len(events) != len(types) {
-		t.Errorf("Expected %i events, got %i", len(types), len(events))
+		t.Errorf("Expected %d events, got %d", len(types), len(events))
 	}
 
 	for i, et := range types {
 		if events[i].Type != et {
-			t.Errorf("Event %i type is %v, expected %v", i, events[i].Type, et)
+			t.Errorf("Event %d type is %v, expected %v", i, events[i].Type, et)
 		}
 	}
 }