From 238b4a0d8e059e6b648fbb94d324b183fe1dc614 Mon Sep 17 00:00:00 2001
From: Rohit Agarwal <agarwalrohit@google.com>
Date: Tue, 7 Nov 2017 12:34:48 -0800
Subject: [PATCH] Fix TestSummaryProvider.

assert.Contains() checks if its second argument (which is supposed to be
a single element) is contained in its first argument (which is supposed
to be a slice/map etc.) The third and following arguments are supposed
to be message and args for the output in case of failure.

Because of this bad form, a failure was hidden, the system container is
named "misc", not "system".
---
 pkg/kubelet/server/stats/summary_test.go | 50 ++++++++++++------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/pkg/kubelet/server/stats/summary_test.go b/pkg/kubelet/server/stats/summary_test.go
index 22e38f7f679..13e4ae0b76d 100644
--- a/pkg/kubelet/server/stats/summary_test.go
+++ b/pkg/kubelet/server/stats/summary_test.go
@@ -46,7 +46,7 @@ func TestSummaryProvider(t *testing.T) {
 		node         = &v1.Node{ObjectMeta: metav1.ObjectMeta{Name: "test-node"}}
 		nodeConfig   = cm.NodeConfig{
 			RuntimeCgroupsName: "/runtime",
-			SystemCgroupsName:  "/system",
+			SystemCgroupsName:  "/misc",
 			KubeletCgroupsName: "/kubelet",
 		}
 		cgroupStatsMap = map[string]struct {
@@ -55,7 +55,7 @@ func TestSummaryProvider(t *testing.T) {
 		}{
 			"/":        {cs: getContainerStats(), ns: getNetworkStats()},
 			"/runtime": {cs: getContainerStats(), ns: getNetworkStats()},
-			"/system":  {cs: getContainerStats(), ns: getNetworkStats()},
+			"/misc":    {cs: getContainerStats(), ns: getNetworkStats()},
 			"/kubelet": {cs: getContainerStats(), ns: getNetworkStats()},
 		}
 	)
@@ -71,7 +71,7 @@ func TestSummaryProvider(t *testing.T) {
 		On("RootFsStats").Return(rootFsStats, nil).
 		On("GetCgroupStats", "/").Return(cgroupStatsMap["/"].cs, cgroupStatsMap["/"].ns, nil).
 		On("GetCgroupStats", "/runtime").Return(cgroupStatsMap["/runtime"].cs, cgroupStatsMap["/runtime"].ns, nil).
-		On("GetCgroupStats", "/system").Return(cgroupStatsMap["/system"].cs, cgroupStatsMap["/system"].ns, nil).
+		On("GetCgroupStats", "/misc").Return(cgroupStatsMap["/misc"].cs, cgroupStatsMap["/misc"].ns, nil).
 		On("GetCgroupStats", "/kubelet").Return(cgroupStatsMap["/kubelet"].cs, cgroupStatsMap["/kubelet"].ns, nil)
 
 	provider := NewSummaryProvider(mockStatsProvider)
@@ -87,29 +87,27 @@ func TestSummaryProvider(t *testing.T) {
 	assert.Equal(summary.Node.Runtime, &statsapi.RuntimeStats{ImageFs: imageFsStats})
 
 	assert.Equal(len(summary.Node.SystemContainers), 3)
-	assert.Contains(summary.Node.SystemContainers,
-		statsapi.ContainerStats{
-			Name:               "kubelet",
-			StartTime:          cgroupStatsMap["/kubelet"].cs.StartTime,
-			CPU:                cgroupStatsMap["/kubelet"].cs.CPU,
-			Memory:             cgroupStatsMap["/kubelet"].cs.Memory,
-			UserDefinedMetrics: cgroupStatsMap["/kubelet"].cs.UserDefinedMetrics,
-		},
-		statsapi.ContainerStats{
-			Name:               "system",
-			StartTime:          cgroupStatsMap["/system"].cs.StartTime,
-			CPU:                cgroupStatsMap["/system"].cs.CPU,
-			Memory:             cgroupStatsMap["/system"].cs.Memory,
-			UserDefinedMetrics: cgroupStatsMap["/system"].cs.UserDefinedMetrics,
-		},
-		statsapi.ContainerStats{
-			Name:               "runtime",
-			StartTime:          cgroupStatsMap["/runtime"].cs.StartTime,
-			CPU:                cgroupStatsMap["/runtime"].cs.CPU,
-			Memory:             cgroupStatsMap["/runtime"].cs.Memory,
-			UserDefinedMetrics: cgroupStatsMap["/runtime"].cs.UserDefinedMetrics,
-		},
-	)
+	assert.Contains(summary.Node.SystemContainers, statsapi.ContainerStats{
+		Name:               "kubelet",
+		StartTime:          cgroupStatsMap["/kubelet"].cs.StartTime,
+		CPU:                cgroupStatsMap["/kubelet"].cs.CPU,
+		Memory:             cgroupStatsMap["/kubelet"].cs.Memory,
+		UserDefinedMetrics: cgroupStatsMap["/kubelet"].cs.UserDefinedMetrics,
+	})
+	assert.Contains(summary.Node.SystemContainers, statsapi.ContainerStats{
+		Name:               "misc",
+		StartTime:          cgroupStatsMap["/misc"].cs.StartTime,
+		CPU:                cgroupStatsMap["/misc"].cs.CPU,
+		Memory:             cgroupStatsMap["/misc"].cs.Memory,
+		UserDefinedMetrics: cgroupStatsMap["/misc"].cs.UserDefinedMetrics,
+	})
+	assert.Contains(summary.Node.SystemContainers, statsapi.ContainerStats{
+		Name:               "runtime",
+		StartTime:          cgroupStatsMap["/runtime"].cs.StartTime,
+		CPU:                cgroupStatsMap["/runtime"].cs.CPU,
+		Memory:             cgroupStatsMap["/runtime"].cs.Memory,
+		UserDefinedMetrics: cgroupStatsMap["/runtime"].cs.UserDefinedMetrics,
+	})
 	assert.Equal(summary.Pods, podStats)
 }