From 3ad58886739fcd7124a44799dabea50d47093c14 Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Fri, 12 Feb 2016 12:35:49 -0800 Subject: [PATCH] Revert "node e2e tests - disable testing metrics for system containers" This reverts commit 75bce624cbc69711533254ec28b3ad96b7658885. --- test/e2e_node/kubelet_test.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/test/e2e_node/kubelet_test.go b/test/e2e_node/kubelet_test.go index 351e637b6ea..9cb3894e95b 100644 --- a/test/e2e_node/kubelet_test.go +++ b/test/e2e_node/kubelet_test.go @@ -151,17 +151,15 @@ var _ = Describe("Kubelet", func() { Expect(summary.Node.Fs.UsedBytes).NotTo(BeNil()) Expect(*summary.Node.Fs.UsedBytes).NotTo(BeZero()) - // TODO: Enable these once system containers are working on all distros - // See issue #20993 - // By("Having resources for kubelet and runtime system containers") - // sysContainers := map[string]stats.ContainerStats{} - // sysContainersList := []string{} - // for _, container := range summary.Node.SystemContainers { - // sysContainers[container.Name] = container - // sysContainersList = append(sysContainersList, container.Name) - // ExpectContainerStatsNotEmpty(&container) - // } - // Expect(sysContainersList).To(ConsistOf("kubelet", "runtime")) + By("Having resources for kubelet and runtime system containers") + sysContainers := map[string]stats.ContainerStats{} + sysContainersList := []string{} + for _, container := range summary.Node.SystemContainers { + sysContainers[container.Name] = container + sysContainersList = append(sysContainersList, container.Name) + ExpectContainerStatsNotEmpty(&container) + } + Expect(sysContainersList).To(ConsistOf("kubelet", "runtime")) // Verify Pods Stats are present podsList := []string{}