Merge pull request #51 from linkernetworks/hwchiu/fix-test

Add the testing condition for prometheus
linkernetworks · Jun 27, 2018 · 8c31223 · 8c31223
2 parents 4481511 + ab2e1ce
commit 8c31223
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ install:
 script:
   - docker run --name prometheus -d -p 9090:9090 prom/prometheus
   - make build
-  - sudo -E PATH=$PATH TEST_GRPC=1 make src.test-coverage
+  - sudo -E PATH=$PATH TEST_PROMETHEUS=1 TEST_GRPC=1 make src.test-coverage
   - docker build --tag sdnvortex/vortex --file ./dockerfiles/Dockerfile .
 
 before_deploy:

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -62,7 +62,7 @@ pipeline {
         }
         stage('Test') {
             steps {
-                withEnv(["GOPATH+AA=${env.WORKSPACE}"]) {
+                withEnv(["GOPATH+AA=${env.WORKSPACE}", "TEST_PROMETHEUS=1"]) {
                     dir ("src/github.com/linkernetworks/vortex") {
                         sh "make src.test-coverage 2>&1 | tee >(go-junit-report > report.xml)"
                         junit "report.xml"
@@ -111,4 +111,4 @@ pipeline {
             }
         }
     }
-}
+}
diff --git a/src/server/handler_prometheus_test.go b/src/server/handler_prometheus_test.go
@@ -3,6 +3,7 @@ package server
 import (
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 
 	restful "github.com/emicklei/go-restful"
@@ -33,6 +34,10 @@ func (suite *PrometheusTestSuite) SetupSuite() {
 }
 
 func TestPrometheusTestSuite(t *testing.T) {
+	if _, defined := os.LookupEnv("TEST_PROMETHEUS"); !defined {
+		t.SkipNow()
+		return
+	}
 	suite.Run(t, new(PrometheusTestSuite))
 }