Update TestNormalize to only test Windows

estesp · estesp · commit 807ded41f0ac · 2022-03-10T11:38:10.000-05:00
The output of platforms.DefaultSpec() and the normalized version of the
default platform on 32- and 64-bit ARM are not comparable. This test
was added to validate not losing Windows-specific information during
normalize of the platform object, so for now we are moving this to be a
Windows-only test until we resolve the right behavior on ARM.

Signed-off-by: Phil Estes &lt;estesp@amazon.com&gt;
diff --git a/platforms/platforms_test.go b/platforms/platforms_test.go
@@ -23,7 +23,6 @@ import (
 	"testing"
 
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/stretchr/testify/require"
 )
 
 func TestParseSelector(t *testing.T) {
@@ -365,7 +364,3 @@ func TestParseSelectorInvalid(t *testing.T) {
 		})
 	}
 }
-
-func TestNormalize(t *testing.T) {
-	require.Equal(t, DefaultSpec(), Normalize(DefaultSpec()))
-}
diff --git a/platforms/platforms_windows_test.go b/platforms/platforms_windows_test.go
@@ -0,0 +1,27 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package platforms
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestNormalize(t *testing.T) {
+	require.Equal(t, DefaultSpec(), Normalize(DefaultSpec()))
+}

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ import (`
`23`	`23`	`"testing"`
`24`	`24`
`25`	`25`	`specs "github.com/opencontainers/image-spec/specs-go/v1"`
`26`		`- "github.com/stretchr/testify/require"`
`27`	`26`	`)`
`28`	`27`
`29`	`28`	`func TestParseSelector(t *testing.T) {`
`@@ -365,7 +364,3 @@ func TestParseSelectorInvalid(t *testing.T) {`
`365`	`364`	`})`
`366`	`365`	`}`
`367`	`366`	`}`
`368`		`-`
`369`		`-func TestNormalize(t *testing.T) {`
`370`		`- require.Equal(t, DefaultSpec(), Normalize(DefaultSpec()))`
`371`		`-}`