integration: add FeatureMergeDiff compat

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
moby · Mar 13, 2023 · fd7081c · fd7081c
1 parent 791c4bb
commit fd7081c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/client/mergediff_test.go b/client/mergediff_test.go
@@ -1187,6 +1187,7 @@ func (tc verifyContents) Name() string {
 }
 
 func (tc verifyContents) Run(t *testing.T, sb integration.Sandbox) {
+	integration.CheckFeatureCompat(t, sb, integration.FeatureMergeDiff)
 	if tc.skipOnRootless && sb.Rootless() {
 		t.Skip("rootless")
 	}

diff --git a/util/testutil/integration/sandbox.go b/util/testutil/integration/sandbox.go
@@ -284,6 +284,7 @@ const (
 	FeatureFrontendTargets      = "frontendTargets"
 	FeatureImageExporter        = "imageExporter"
 	FeatureInfo                 = "info"
+	FeatureMergeDiff            = "mergeDiff"
 	FeatureMultiCacheExport     = "multiCacheExport"
 	FeatureMultiPlatform        = "multiPlatform"
 	FeatureOCIExporter          = "ociExporter"
@@ -309,6 +310,7 @@ var features = map[string]struct{}{
 	FeatureFrontendTargets:      {},
 	FeatureImageExporter:        {},
 	FeatureInfo:                 {},
+	FeatureMergeDiff:            {},
 	FeatureMultiCacheExport:     {},
 	FeatureMultiPlatform:        {},
 	FeatureOCIExporter:          {},