Fix acceptance by skipping test if feature not supported

Signed-off-by: Natalie Arellano <[email protected]>
buildpacks · May 20, 2024 · 6f50db6 · 6f50db6
1 parent d81ec16
commit 6f50db6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
@@ -2512,6 +2512,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
 					when("--platform", func() {
 						wrongArch := "arm64"
 						it.Before(func() {
+							h.SkipIf(t, !pack.SupportsFeature(invoke.PlatformOption), "")
 							h.SkipIf(t, imageManager.HostOS() == "windows", "Not relevant on windows")
 							if hostArch := imageManager.HostArch(); hostArch == wrongArch {
 								wrongArch = "amd64"

diff --git a/acceptance/invoke/pack.go b/acceptance/invoke/pack.go
@@ -239,6 +239,7 @@ const (
 	FlattenBuilderCreationV2
 	FixesRunImageMetadata
 	ManifestCommands
+	PlatformOption
 )
 
 var featureTests = map[Feature]func(i *PackInvoker) bool{
@@ -278,6 +279,9 @@ var featureTests = map[Feature]func(i *PackInvoker) bool{
 	ManifestCommands: func(i *PackInvoker) bool {
 		return i.atLeast("v0.34.0")
 	},
+	PlatformOption: func(i *PackInvoker) bool {
+		return i.atLeast("v0.34.0")
+	},
 }
 
 func (i *PackInvoker) SupportsFeature(f Feature) bool {

diff --git a/pkg/client/build.go b/pkg/client/build.go
@@ -347,7 +347,7 @@ func (c *Client) Build(ctx context.Context, opts BuildOptions) error {
 
 	platformToUse := opts.Platform
 	if platformToUse == "" {
-		platformToUse = fmt.Sprintf("%s/%s", builderOS, builderArch) // TODO: what about arch variant, etc.
+		platformToUse = fmt.Sprintf("%s/%s", builderOS, builderArch) // FIXME: what about arch variant, etc.
 	}
 
 	bldr, err := c.getBuilder(rawBuilderImage)
@@ -1231,7 +1231,7 @@ func (c *Client) fetchBuildpack(ctx context.Context, bp string, relativeBaseDir
 
 		platformToUse := opts.Platform
 		if platformToUse == "" {
-			platformToUse = fmt.Sprintf("%s/%s", builderOS, builderArch) // TODO: what about arch variant, etc.
+			platformToUse = fmt.Sprintf("%s/%s", builderOS, builderArch) // FIXME: what about arch variant, etc.
 		}
 
 		downloadOptions := buildpack.DownloadOptions{