improve unit test for query situation

Former-commit-id: f9e085dcff7fd59f9abc6a33c7ae6bcf48107537 [formerly d9486c6] Former-commit-id: c8b858760dbe1db88e926ea1cf02754592727833
linkernetworks · Jul 25, 2018 · 25a5ac2 · 25a5ac2
1 parent dd7cb31
commit 25a5ac2
Showing 1 changed file with 28 additions and 0 deletions.
diff --git a/src/server/handler_prometheus_test.go b/src/server/handler_prometheus_test.go
@@ -83,6 +83,13 @@ func (suite *PrometheusTestSuite) TestListPodMetrics() {
 	httpWriter := httptest.NewRecorder()
 	suite.wc.Dispatch(httpWriter, httpRequest)
 	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
+
+	httpRequest, err = http.NewRequest("GET", "http://localhost:7890/v1/monitoring/pods?node=.*&namespace=.*&controller=.*", nil)
+	suite.NoError(err)
+
+	httpWriter = httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
 }
 
 func (suite *PrometheusTestSuite) TestGetPodMetrics() {
@@ -106,6 +113,13 @@ func (suite *PrometheusTestSuite) TestListContainerMetrics() {
 	httpWriter := httptest.NewRecorder()
 	suite.wc.Dispatch(httpWriter, httpRequest)
 	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
+
+	httpRequest, err = http.NewRequest("GET", "http://localhost:7890/v1/monitoring/containers?node=.*&namespace=.*&pod=.*", nil)
+	suite.NoError(err)
+
+	httpWriter = httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
 }
 
 func (suite *PrometheusTestSuite) TestGetContainerMetrics() {
@@ -129,6 +143,13 @@ func (suite *PrometheusTestSuite) TestListServiceMetrics() {
 	httpWriter := httptest.NewRecorder()
 	suite.wc.Dispatch(httpWriter, httpRequest)
 	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
+
+	httpRequest, err = http.NewRequest("GET", "http://localhost:7890/v1/monitoring/services?namespace=.*", nil)
+	suite.NoError(err)
+
+	httpWriter = httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
 }
 
 func (suite *PrometheusTestSuite) TestGetServiceMetrics() {
@@ -152,6 +173,13 @@ func (suite *PrometheusTestSuite) TestListControllerMetrics() {
 	httpWriter := httptest.NewRecorder()
 	suite.wc.Dispatch(httpWriter, httpRequest)
 	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
+
+	httpRequest, err = http.NewRequest("GET", "http://localhost:7890/v1/monitoring/controllers?namespace=.*", nil)
+	suite.NoError(err)
+
+	httpWriter = httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
 }
 
 func (suite *PrometheusTestSuite) TestGetControllerMetrics() {