Fix unit test errors after rebasing

knative · Aug 29, 2019 · fff4bfe · fff4bfe
1 parent 627405c
commit fff4bfe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/pkg/kn/commands/service/service_create_mock_test.go b/pkg/kn/commands/service/service_create_mock_test.go
@@ -72,6 +72,7 @@ func TestServiceCreateEnvMock(t *testing.T) {
 	assert.NilError(t, err)
 	template.Spec.GetContainer().Env = envVars
 	template.Spec.Containers[0].Image = "gcr.io/foo/bar:baz"
+	template.Annotations = map[string]string{servinglib.UserImageAnnotationKey: "gcr.io/foo/bar:baz"}
 	r.CreateService(service, nil)
 
 	output, err := executeServiceCommand(client, "create", "foo", "--image", "gcr.io/foo/bar:baz", "-e", "a=mouse", "--env", "b=cookie", "--env=empty", "--async", "--revision-name=")

diff --git a/pkg/kn/commands/service/service_update_mock_test.go b/pkg/kn/commands/service/service_update_mock_test.go
@@ -41,6 +41,7 @@ func TestServiceUpdateEnvMock(t *testing.T) {
 		{Name: "empty", Value: ""},
 	}
 	template.Spec.GetContainer().Image = "gcr.io/foo/bar:baz"
+	template.Annotations = map[string]string{servinglib.UserImageAnnotationKey: "gcr.io/foo/bar:baz"}
 
 	updated := getService("foo")
 	template, err = servinglib.RevisionTemplateOfService(updated)
@@ -50,6 +51,7 @@ func TestServiceUpdateEnvMock(t *testing.T) {
 		{Name: "b", Value: "cookie"},
 	}
 	template.Spec.GetContainer().Image = "gcr.io/foo/bar:baz"
+	template.Annotations = map[string]string{servinglib.UserImageAnnotationKey: "gcr.io/foo/bar:baz"}
 
 	r := client.Recorder()
 	r.GetService("foo", nil, errors.NewNotFound(v1alpha1.Resource("service"), "foo"))

diff --git a/pkg/kn/commands/service/service_update_test.go b/pkg/kn/commands/service/service_update_test.go
@@ -369,10 +369,6 @@ func TestServiceUpdatePinsToDigestWhenAsked(t *testing.T) {
 	delete(template.Annotations, servinglib.UserImageAnnotationKey)
 	if err != nil {
 		t.Fatal(err)
-	} else if template.Spec.DeprecatedContainer.Image != "gcr.io/foo/bar:baz" {
-		t.Fatalf("wrong image set: %v", template.Spec.DeprecatedContainer.Image)
-	} else if template.Spec.DeprecatedContainer.Env[0] != expectedEnvVar {
-		t.Fatalf("wrong env set: got=%#v\n want=%#v", template.Spec.DeprecatedContainer.Env, expectedEnvVar)
 	}
 
 	servinglib.UpdateImage(template, "gcr.io/foo/bar:baz")