Merge pull request #28 from thandayuthapani/master

Changes for travis Unit Test

Author: tianxiaoliang

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 sudo: required
-go: 
+go:
   - 1.8.3
 install: true
 
@@ -15,11 +15,11 @@ jobs:
     - stage: Format Checker
       script: bash -x scripts/travis/formatChecker.sh
     - stage: DeadCode Checker
-      script: 
+      script:
         - go get -u github.com/tsenart/deadcode
         - bash -x scripts/travis/deadCodeChecker.sh
     - stage: Misspell Checker
-      script: 
+      script:
         - go get -u github.com/client9/misspell
         - bash -x scripts/travis/misspellChecker.sh
     - stage: GoConst Checker
@@ -34,3 +34,6 @@ jobs:
       script:
         - go get github.com/fzipp/gocyclo
         - bash -x scripts/travis/goCycloChecker.sh
+    - stage: Unit Test
+      script:
+        - bash -x scripts/travis/unit_test.sh

csemonitor_test.go

@@ -50,15 +50,15 @@ func initEnv() {
 func TestNewReporter(t *testing.T) {
 	initEnv()
 	assert := assert.New(t)
-	reporter := NewReporter(metrics.DefaultRegistry, "127.0.0.1:8080", http.Header{"Content-Type": []string{"application/json"}}, time.Second, &tls.Config{}, "default", "0.0.1", "Server", "", "")
+	reporter := NewReporter(metrics.DefaultRegistry, "127.0.0.1:8080", http.Header{"Content-Type": []string{"application/json"}}, time.Second, &tls.Config{}, "default", "0.0.1", "Server", "")
 	assert.Equal(reporter.Interval, time.Second)
 	assert.Equal(reporter.CseMonitorAddr, "127.0.0.1:8080")
 	assert.Equal(reporter.Header, http.Header{"Content-Type": []string{"application/json"}})
 }
 func TestCseMonitor(t *testing.T) {
 	initEnv()
 	assert := assert.New(t)
-	reporter := NewReporter(metrics.DefaultRegistry, "127.0.0.1:8080", http.Header{"Content-Type": []string{"application/json"}}, time.Second, &tls.Config{}, "default", "0.0.1", "Server", "", "")
+	reporter := NewReporter(metrics.DefaultRegistry, "127.0.0.1:8080", http.Header{"Content-Type": []string{"application/json"}}, time.Second, &tls.Config{}, "default", "0.0.1", "Server", "")
 	config.SelfServiceName = "testService"
 	monitorData := reporter.getData("default", "0.0.1", "testService", "", "", "")
 	assert.Equal(monitorData.Name, "testService")
@@ -67,7 +67,7 @@ func TestCseMonitor(t *testing.T) {
 func TestCseMonitor2(t *testing.T) {
 	initEnv()
 	assert := assert.New(t)
-	reporter := NewReporter(metrics.DefaultRegistry, "127.0.0.1:8080", http.Header{"Content-Type": []string{"application/json"}}, time.Second, &tls.Config{}, "default", "0.0.1", "Server", "", "")
+	reporter := NewReporter(metrics.DefaultRegistry, "127.0.0.1:8080", http.Header{"Content-Type": []string{"application/json"}}, time.Second, &tls.Config{}, "default", "0.0.1", "Server", "")
 	metricCollector := NewCseCollector("source.Provider.Microservice.SchemaID.OperationId")
 	config.SelfServiceName = "testService"
 
@@ -90,7 +90,7 @@ func TestCseMonitorClient_PostMetrics(t *testing.T) {
 	initEnv()
 	assert := assert.New(t)
 	config.SelfServiceName = "testService"
-	reporter := NewReporter(metrics.DefaultRegistry, "127.0.0.1:8080", http.Header{"Content-Type": []string{"application/json"}}, time.Second, &tls.Config{}, "default", "0.0.1", "Server", "", "")
+	reporter := NewReporter(metrics.DefaultRegistry, "127.0.0.1:8080", http.Header{"Content-Type": []string{"application/json"}}, time.Second, &tls.Config{}, "default", "0.0.1", "Server", "")
 	cseMonitClient := NewCseMonitorClient(http.Header{"Content-Type": []string{"application/json"}}, "http://127.0.0.1:9098", &tls.Config{}, "v2")
 	assert.Equal(cseMonitClient.URL, "http://127.0.0.1:9098")
 	assert.Equal(cseMonitClient.Header, http.Header{"Content-Type": []string{"application/json"}})

scripts/travis/unit_test.sh

@@ -1,46 +1,29 @@
 #!/bin/sh
 set -e
 
-go get -u github.com/FiloSottile/gvt
-mkdir -p $GOPATH/src/github.com/fsnotify
-mkdir -p $GOPATH/src/github.com/spf13
-mkdir -p $GOPATH/src/golang.org/x
-
-gvt restore
-
+go get github.com/rcrowley/go-metrics
+go get github.com/stretchr/testify/assert
 go get gopkg.in/yaml.v2
+go get github.com/Masterminds/glide
 
-cd $GOPATH/src/github.com/ServiceComb
-git clone https://github.com/ServiceComb/go-chassis.git
-git clone https://github.com/ServiceComb/go-archaius.git
-git clone https://github.com/ServiceComb/paas-lager.git
-git clone https://github.com/ServiceComb/auth.git
-
-cd $GOPATH/src/github.com/fsnotify
-git clone https://github.com/fsnotify/fsnotify.git
-cd fsnotify
-git reset --hard 629574ca2a5df945712d3079857300b5e4da0236
-
-cd $GOPATH/src/github.com/spf13
-git clone https://github.com/spf13/cast.git
-cd cast
-git reset --hard acbeb36b902d72a7a4c18e8f3241075e7ab763e4
-
-mkdir -p $GOPATH/src/github.com/stathat
-
-cd $GOPATH/src/github.com/stathat
-git clone https://github.com/stathat/go.git
+mkdir -p $HOME/gopath/src/github.com/ServiceComb/
+cd $HOME/gopath/src/github.com/ServiceComb
+git clone http://github.com/ServiceComb/go-chassis
+cd $HOME/gopath/src/github.com/ServiceComb/go-chassis
+glide install
+mkdir -p $HOME/gopath/src/github.com/ServiceComb/go-chassis/vendor/github.com/ServiceComb/cse-collector/
+rsync -az ${TRAVIS_BUILD_DIR}/ $HOME/gopath/src/github.com/ServiceComb/go-chassis/vendor/github.com/ServiceComb/cse-collector/
+export TRAVIS_BUILD_DIR=$HOME/gopath/src/github.com/ServiceComb/go-chassis/vendor/github.com/ServiceComb/cse-collector/
+cd $HOME/gopath/src/github.com/ServiceComb/go-chassis/vendor/github.com/ServiceComb/cse-collector/
 
-cd $GOPATH/src/golang.org/x
-git clone https://github.com/golang/sys.git
 
-cd $GOPATH/src/github.com/ServiceComb/cse-collector
+cd $GOPATH/src/github.com/ServiceComb/go-chassis/vendor/github.com/ServiceComb/cse-collector
 #Start unit test
 for d in $(go list ./...); do
     echo $d
     echo $GOPATH
     cd $GOPATH/src/$d
     if [ $(ls | grep _test.go | wc -l) -gt 0 ]; then
-        go test 
+        go test
     fi
 done