From f8f546d3758856ae0602aa06b7e73f4f30576e22 Mon Sep 17 00:00:00 2001 From: Pei Hsuan Tsai Date: Tue, 24 Jul 2018 09:47:27 +0800 Subject: [PATCH] test --- Makefile | 3 ++- src/prometheuscontroller/expression_test.go | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 73dbc60d..bf4de43d 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,8 @@ apps.init-helm: .PHONY: apps.launch-apps apps.launch-apps: helm install --name foundation --debug --wait --set global.environment=local deploy/helm/foundation - helm install --name prometheus --debug --wait --set global.environment=local deploy/helm/apps/charts/prometheus + # helm install --name prometheus --debug --wait --set global.environment=local deploy/helm/apps/charts/prometheus + kubectl apply -f deploy/kubernetes/apps/monitoring -R helm install --name vortex-server --debug --wait --set global.environment=local deploy/helm/apps/charts/vortex-server .PHONY: apps.teardown diff --git a/src/prometheuscontroller/expression_test.go b/src/prometheuscontroller/expression_test.go index 02b7a1ac..8e91432c 100644 --- a/src/prometheuscontroller/expression_test.go +++ b/src/prometheuscontroller/expression_test.go @@ -79,14 +79,14 @@ func (suite *PrometheusExpressionTestSuite) TestGetPod() { } func (suite *PrometheusExpressionTestSuite) TestGetContainer() { - // namespace := "vortex" - // pods, err := suite.sp.KubeCtl.GetPods(namespace) - // suite.NoError(err) - // containerName := pods[0].Status.ContainerStatuses[0].Name + namespace := "vortex" + pods, err := suite.sp.KubeCtl.GetPods(namespace) + suite.NoError(err) + containerName := pods[0].Status.ContainerStatuses[0].Name - container, err := GetContainer(suite.sp, "cadvisor") + container, err := GetContainer(suite.sp, containerName) suite.NoError(err) - suite.Equal("cadvisor", container.Detail.ContainerName) + suite.Equal(containerName, container.Detail.ContainerName) } func (suite *PrometheusExpressionTestSuite) TestGetService() {