Fix up tests based on merge openfaas#624

Signed-off-by: Alistair Hey <[email protected]>

Author: ah-f3

handlers/deploy_test.go

@@ -27,8 +27,9 @@ func Test_buildAnnotations_Empty_In_CreateRequest(t *testing.T) {
 		t.Errorf("missing prometheus.io.scrape key")
 	}
 
-	if v != "false" {
-		t.Errorf("want: %s for annotation prometheus.io.scrape got: %s", "false", v)
+	want := "false"
+	if v != want {
+		t.Errorf("want: %s for annotation prometheus.io.scrape got: %s", want, v)
 	}
 }
 
@@ -45,9 +46,9 @@ func Test_buildAnnotations_Premetheus_NotOverridden(t *testing.T) {
 	if !ok {
 		t.Errorf("missing prometheus.io.scrape key")
 	}
-
-	if v != "true" {
-		t.Errorf("want: %s for annotation prometheus.io.scrape got: %s", "true", v)
+	want := "true"
+	if v != want {
+		t.Errorf("want: %s for annotation prometheus.io.scrape got: %s", want, v)
 	}
 }
 

pkg/controller/deployment_test.go

@@ -107,7 +107,9 @@ func Test_newDeployment_PrometheusScrape_NotOverridden(t *testing.T) {
 
 	deployment := newDeployment(function, nil, secrets, factory)
 
-	if deployment.Spec.Template.Annotations["prometheus.io.scrape"] != "true" {
-		t.Errorf("Annotation prometheus.io.scrape should be %s, was: %s", "true", deployment.Spec.Template.Annotations["prometheus.io.scrape"])
+	want := "true"
+
+	if deployment.Spec.Template.Annotations["prometheus.io.scrape"] != want {
+		t.Errorf("Annotation prometheus.io.scrape should be %s, was: %s", want, deployment.Spec.Template.Annotations["prometheus.io.scrape"])
 	}
 }