From 123d1a925f865907841c347a97de7aa43e76750c Mon Sep 17 00:00:00 2001
From: changyaowei <156511344@qq.com>
Date: Mon, 15 Apr 2019 20:26:00 +0800
Subject: [PATCH 1/2] modify random failure

---
 pkg/kubelet/pleg/generic_test.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/kubelet/pleg/generic_test.go b/pkg/kubelet/pleg/generic_test.go
index 860ff2934b8..401af6e48ab 100644
--- a/pkg/kubelet/pleg/generic_test.go
+++ b/pkg/kubelet/pleg/generic_test.go
@@ -217,9 +217,17 @@ func TestEventChannelFull(t *testing.T) {
 		{ID: "1234", Type: ContainerDied, Data: "c2"},
 		{ID: "1234", Type: ContainerStarted, Data: "c3"},
 		{ID: "4567", Type: ContainerRemoved, Data: "c1"},
+		{ID: "4567", Type: ContainerStarted, Data: "c4"},
 	}
 	actual = getEventsFromChannel(ch)
-	verifyEvents(t, expected, actual)
+	assert.True(t, len(actual) == 4, "channel length should be 4")
+	for _, actualEvent := range actual {
+		for _, expectedEvent := range expected {
+			if actualEvent.ID == expectedEvent.ID && actualEvent.Data == expectedEvent.Data {
+				assert.True(t, actualEvent.Type == expectedEvent.Type, "event type should be equal")
+			}
+		}
+	}
 }
 
 func TestDetectingContainerDeaths(t *testing.T) {

From 850f4bbd36aba0fb72615eb7f07249c0d033a803 Mon Sep 17 00:00:00 2001
From: changyaowei <156511344@qq.com>
Date: Sat, 27 Apr 2019 08:04:58 +0800
Subject: [PATCH 2/2] modify random failure

---
 pkg/kubelet/pleg/generic_test.go | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkg/kubelet/pleg/generic_test.go b/pkg/kubelet/pleg/generic_test.go
index 401af6e48ab..9e648e9c13d 100644
--- a/pkg/kubelet/pleg/generic_test.go
+++ b/pkg/kubelet/pleg/generic_test.go
@@ -211,23 +211,17 @@ func TestEventChannelFull(t *testing.T) {
 		}},
 	}
 	pleg.relist()
-	// event channel is full, discard events
-	expected = []*PodLifecycleEvent{
+	allEvents := []*PodLifecycleEvent{
 		{ID: "1234", Type: ContainerRemoved, Data: "c1"},
 		{ID: "1234", Type: ContainerDied, Data: "c2"},
 		{ID: "1234", Type: ContainerStarted, Data: "c3"},
 		{ID: "4567", Type: ContainerRemoved, Data: "c1"},
 		{ID: "4567", Type: ContainerStarted, Data: "c4"},
 	}
+	// event channel is full, discard events
 	actual = getEventsFromChannel(ch)
 	assert.True(t, len(actual) == 4, "channel length should be 4")
-	for _, actualEvent := range actual {
-		for _, expectedEvent := range expected {
-			if actualEvent.ID == expectedEvent.ID && actualEvent.Data == expectedEvent.Data {
-				assert.True(t, actualEvent.Type == expectedEvent.Type, "event type should be equal")
-			}
-		}
-	}
+	assert.Subsetf(t, allEvents, actual, "actual events should in all events")
 }
 
 func TestDetectingContainerDeaths(t *testing.T) {