Merge pull request #76603 from changyaowei/generic_ut_fix

fix  TestEventChannelFull random fail
This commit is contained in:
Kubernetes Prow Robot 2019-05-08 17:14:47 -07:00 committed by GitHub
commit 60a4c3c003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -211,15 +211,17 @@ func TestEventChannelFull(t *testing.T) {
}}, }},
} }
pleg.relist() pleg.relist()
// event channel is full, discard events allEvents := []*PodLifecycleEvent{
expected = []*PodLifecycleEvent{
{ID: "1234", Type: ContainerRemoved, Data: "c1"}, {ID: "1234", Type: ContainerRemoved, Data: "c1"},
{ID: "1234", Type: ContainerDied, Data: "c2"}, {ID: "1234", Type: ContainerDied, Data: "c2"},
{ID: "1234", Type: ContainerStarted, Data: "c3"}, {ID: "1234", Type: ContainerStarted, Data: "c3"},
{ID: "4567", Type: ContainerRemoved, Data: "c1"}, {ID: "4567", Type: ContainerRemoved, Data: "c1"},
{ID: "4567", Type: ContainerStarted, Data: "c4"},
} }
// event channel is full, discard events
actual = getEventsFromChannel(ch) actual = getEventsFromChannel(ch)
verifyEvents(t, expected, actual) assert.True(t, len(actual) == 4, "channel length should be 4")
assert.Subsetf(t, allEvents, actual, "actual events should in all events")
} }
func TestDetectingContainerDeaths(t *testing.T) { func TestDetectingContainerDeaths(t *testing.T) {