From 807ded41f0ac99c795ecf8acf20103d0ebdf0973 Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Fri, 18 Feb 2022 17:25:17 -0500 Subject: [PATCH] Update TestNormalize to only test Windows 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 --- platforms/platforms_test.go | 5 ----- platforms/platforms_windows_test.go | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 platforms/platforms_windows_test.go diff --git a/platforms/platforms_test.go b/platforms/platforms_test.go index fb24eab77..c070ddae1 100644 --- 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 new file mode 100644 index 000000000..89f861926 --- /dev/null +++ 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())) +}