From cfeddcf6546b793791918853608572cd702bd992 Mon Sep 17 00:00:00 2001 From: knight42 Date: Mon, 24 Aug 2020 02:32:27 +0800 Subject: [PATCH] test(kuberuntime): deflake TestRemoveContainer Signed-off-by: knight42 --- pkg/kubelet/kuberuntime/kuberuntime_container_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container_test.go b/pkg/kubelet/kuberuntime/kuberuntime_container_test.go index 100240354f3..c1c053348c1 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container_test.go @@ -79,9 +79,12 @@ func TestRemoveContainer(t *testing.T) { err = m.removeContainer(containerID) assert.NoError(t, err) - // Verify container log is removed - assert.Equal(t, []string{expectedContainerLogPath, expectedContainerLogPathRotated, expectedContainerLogSymlink}, fakeOS.Removes) + // Verify container log is removed. + // We could not predict the order of `fakeOS.Removes`, so we use `assert.ElementsMatch` here. + assert.ElementsMatch(t, + []string{expectedContainerLogSymlink, expectedContainerLogPath, expectedContainerLogPathRotated}, + fakeOS.Removes) // Verify container is removed assert.Contains(t, fakeRuntime.Called, "RemoveContainer") containers, err := fakeRuntime.ListContainers(&runtimeapi.ContainerFilter{Id: containerID})