From 2a3ffe40381933cca0b2edf56c79b956c8487919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Senart?= Date: Mon, 8 Jun 2015 21:44:50 +0200 Subject: [PATCH] kubelet: Use assert.EqualValues instead of assert.Equal The last update to github.com/stretchr/testify makes `assert.Equal` consider the type of its arguments. This commit makes this test pass again by only testing for value equality using `assert.EqualValues`. --- pkg/kubelet/image_manager_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/image_manager_test.go b/pkg/kubelet/image_manager_test.go index ffc507e13a5..1b5b30089ad 100644 --- a/pkg/kubelet/image_manager_test.go +++ b/pkg/kubelet/image_manager_test.go @@ -216,7 +216,7 @@ func TestFreeSpaceImagesInUseContainersAreIgnored(t *testing.T) { spaceFreed, err := manager.freeSpace(2048) assert := assert.New(t) require.NoError(t, err) - assert.Equal(1024, spaceFreed) + assert.EqualValues(1024, spaceFreed) assert.Len(fakeDocker.RemovedImages, 1) assert.True(fakeDocker.RemovedImages.Has(imageName(0))) } @@ -245,7 +245,7 @@ func TestFreeSpaceRemoveByLeastRecentlyUsed(t *testing.T) { spaceFreed, err := manager.freeSpace(1024) assert := assert.New(t) require.NoError(t, err) - assert.Equal(1024, spaceFreed) + assert.EqualValues(1024, spaceFreed) assert.Len(fakeDocker.RemovedImages, 1) assert.True(fakeDocker.RemovedImages.Has(imageName(0))) } @@ -277,7 +277,7 @@ func TestFreeSpaceTiesBrokenByDetectedTime(t *testing.T) { spaceFreed, err := manager.freeSpace(1024) assert := assert.New(t) require.NoError(t, err) - assert.Equal(1024, spaceFreed) + assert.EqualValues(1024, spaceFreed) assert.Len(fakeDocker.RemovedImages, 1) assert.True(fakeDocker.RemovedImages.Has(imageName(0))) } @@ -302,7 +302,7 @@ func TestFreeSpaceImagesAlsoDoesLookupByRepoTags(t *testing.T) { spaceFreed, err := manager.freeSpace(1024) assert := assert.New(t) require.NoError(t, err) - assert.Equal(1024, spaceFreed) + assert.EqualValues(1024, spaceFreed) assert.Len(fakeDocker.RemovedImages, 1) assert.True(fakeDocker.RemovedImages.Has(imageName(0))) }