fix some error

linkernetworks · Jun 27, 2018 · 645cf2a · 645cf2a
1 parent ce3faf9
commit 645cf2a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/config/testing.json b/config/testing.json
@@ -10,11 +10,7 @@
     "url": "mongodb://localhost:27017/vortex_test"
   },
   "prometheus": {
-<<<<<<< HEAD
     "url": "http://localhost:9090"
-=======
-    "url": "http://localhost:30003"
->>>>>>> prometheus service provider
   },
   "logger": {
     "dir": "./logs",

diff --git a/src/server/handler_prometheus_test.go b/src/server/handler_prometheus_test.go
@@ -19,9 +19,9 @@ type PrometheusTestSuite struct {
 	api prometheus.API
 }
 
-func (suite *PrometheusTestSuite) SetupTest() {
+func (suite *PrometheusTestSuite) SetupSuite() {
 	cf := config.MustRead("../../config/testing.json")
-	sp := serviceprovider.New(cf)
+	sp := serviceprovider.NewForTesting(cf)
 
 	//init session
 	suite.api = sp.Prometheus.API
@@ -36,7 +36,7 @@ func TestPrometheusTestSuite(t *testing.T) {
 	suite.Run(t, new(PrometheusTestSuite))
 }
 
-func (suite *PrometheusTestSuite) TearDownTest() {
+func (suite *PrometheusTestSuite) TearDownSuite() {
 }
 
 func (suite *PrometheusTestSuite) TestQueryMetrics() {

diff --git a/src/serviceprovider/serviceprovider.go b/src/serviceprovider/serviceprovider.go
@@ -86,6 +86,9 @@ func NewForTesting(cf config.Config) *Container {
 	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
 	mongo := mongo.New(cf.Mongo.Url)
 
+	logger.Infof("Connecting to prometheus: %s", cf.Prometheus.Url)
+	prometheus := prometheus.New(cf.Prometheus.Url)
+
 	clientset := fakeclientset.NewSimpleClientset()
 
 	sp := &Container{

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -1914,4 +1914,4 @@
 		}
 	],
 	"rootPath": "github.com/linkernetworks/vortex"
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1914,4 +1914,4 @@ @@
     		}
     	],
     	"rootPath": "github.com/linkernetworks/vortex"
-    }
+    }