[servicecomb-service-center] branch master updated: [SCB-2094]open server/service ut (#864)

[tianxiaoliang]

This is an automated email from the ASF dual-hosted git repository.

tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new 01671f4  [SCB-2094]open server/service ut (#864)
01671f4 is described below

commit 01671f49402b98123d3810dc8d4a12b2c6af99ea
Author: robotLJW <790504...@qq.com>
AuthorDate: Fri Feb 19 17:20:21 2021 +0800

    [SCB-2094]open server/service ut (#864)
---
 scripts/ut.sh                     | 21 +++++++++++++++++----
 scripts/ut_test_in_docker.sh      |  1 +
 server/service/dependency_test.go | 32 ++++++++++++++++++++------------
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/scripts/ut.sh b/scripts/ut.sh
index 247cf6d..034725c 100755
--- a/scripts/ut.sh
+++ b/scripts/ut.sh
@@ -21,13 +21,26 @@ ROOT_PATH=$(dirname $CURRENT_PATH)
 
 export COVERAGE_PATH=$(pwd)
 cd $1
-for d in $(go list -f '{{.Dir}}' ./... | grep -v vendor| grep -v syncer); do
-    cd $d
-    if [ $(ls | grep _test.go | wc -l) -gt 0 ]; then
+
+run_test() {
+  cd $1
+  if [ $(ls | grep _test.go | wc -l) -gt 0 ]; then
         go test -cover -covermode atomic -coverprofile coverage.out
         if [ -f coverage.out ]; then
             sed '1d;$d' coverage.out >> $ROOT_PATH/coverage.txt
         fi
     fi
-done
+}
+
+test_mode=${TEST_MODE}
+
+if [ ${test_mode} == "mongo" ];then
+  for d in $(go list -f '{{.Dir}}' ./... | grep -v vendor| grep -v syncer | 
grep -v broker); do
+    run_test $d
+  done
+else
+  for d in $(go list -f '{{.Dir}}' ./... | grep -v vendor| grep -v syncer); do
+    run_test $d
+  done
+fi
 
diff --git a/scripts/ut_test_in_docker.sh b/scripts/ut_test_in_docker.sh
index 207f031..ee798ea 100755
--- a/scripts/ut_test_in_docker.sh
+++ b/scripts/ut_test_in_docker.sh
@@ -76,6 +76,7 @@ export TEST_MODE=mongo
 [ $? == 0 ] && ut_for_file datasource
 [ $? == 0 ] && ut_for_dir datasource/mongo
 [ $? == 0 ] && ut_for_dir syncer
+[ $? == 0 ] && ut_for_dir server
 ret=$?
 
 if [ ${ret} == 0 ]; then
diff --git a/server/service/dependency_test.go 
b/server/service/dependency_test.go
index 1bea684..5f5dbb5 100644
--- a/server/service/dependency_test.go
+++ b/server/service/dependency_test.go
@@ -19,13 +19,15 @@ package service_test
 import (
        "strconv"
 
+       pb "github.com/go-chassis/cari/discovery"
+       "github.com/go-chassis/go-archaius"
+       . "github.com/onsi/ginkgo"
+       . "github.com/onsi/gomega"
+
        "github.com/apache/servicecomb-service-center/datasource/etcd/client"
        "github.com/apache/servicecomb-service-center/datasource/etcd/event"
        "github.com/apache/servicecomb-service-center/datasource/etcd/kv"
        "github.com/apache/servicecomb-service-center/datasource/etcd/path"
-       pb "github.com/go-chassis/cari/discovery"
-       . "github.com/onsi/ginkgo"
-       . "github.com/onsi/gomega"
 )
 
 var deh event.DependencyEventHandler
@@ -883,18 +885,24 @@ var _ = Describe("'Dependency' service", func() {
 })
 
 func DependencyHandle() {
-       for {
-               Expect(deh.Handle()).To(BeNil())
+       t := archaius.Get("TEST_MODE")
+       if t == nil {
+               t = "etcd"
+       }
+       if t == "etcd" {
+               for {
+                       Expect(deh.Handle()).To(BeNil())
 
-               key := path.GetServiceDependencyQueueRootKey("")
-               resp, err := kv.Store().DependencyQueue().Search(getContext(),
-                       client.WithStrKey(key), client.WithPrefix(), 
client.WithCountOnly())
+                       key := path.GetServiceDependencyQueueRootKey("")
+                       resp, err := 
kv.Store().DependencyQueue().Search(getContext(),
+                               client.WithStrKey(key), client.WithPrefix(), 
client.WithCountOnly())
 
-               Expect(err).To(BeNil())
+                       Expect(err).To(BeNil())
 
-               // maintain dependency rules.
-               if resp.Count == 0 {
-                       break
+                       // maintain dependency rules.
+                       if resp.Count == 0 {
+                               break
+                       }
                }
        }
 }