github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-19 08:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94185 from knight42/fix/TestRemoveContainer

Browse Source 
test(kuberuntime): deflake TestRemoveContainer
This commit is contained in:
Kubernetes Prow Robot 2020-08-24 15:10:17 -07:00 committed by GitHub
commit 6d0f4749a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubelet/kuberuntime/kuberuntime_container_test.go
View File

@ -79,9 +79,12 @@ func TestRemoveContainer(t *testing.T) {
err = m.removeContainer(containerID) err = m.removeContainer(containerID)
assert.NoError(t, err) 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 // Verify container is removed
assert.Contains(t, fakeRuntime.Called, "RemoveContainer") assert.Contains(t, fakeRuntime.Called, "RemoveContainer")
containers, err := fakeRuntime.ListContainers(&runtimeapi.ContainerFilter{Id: containerID}) containers, err := fakeRuntime.ListContainers(&runtimeapi.ContainerFilter{Id: containerID})