This is an automated email from the ASF dual-hosted git repository.
robotljw 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 8cfd30a [fix] fix test cases for services and dependencies when the
db mode is etcd
new 404df19 Merge pull request #1210 from robotLJW/master
8cfd30a is described below
commit 8cfd30aff11aed79fbfb811da401dbed2785db8c
Author: robotljw <[email protected]>
AuthorDate: Sun Jan 9 20:54:32 2022 +0800
[fix] fix test cases for services and dependencies when the db mode is etcd
---
datasource/etcd/dep_test.go | 69 +++++++++++++++++++++++++++++++++++++++++----
datasource/etcd/ms_test.go | 20 ++++++-------
2 files changed, 74 insertions(+), 15 deletions(-)
diff --git a/datasource/etcd/dep_test.go b/datasource/etcd/dep_test.go
index 769e5c6..35a2ebf 100644
--- a/datasource/etcd/dep_test.go
+++ b/datasource/etcd/dep_test.go
@@ -28,6 +28,7 @@ import (
"github.com/apache/servicecomb-service-center/datasource"
"github.com/apache/servicecomb-service-center/eventbase/model"
"github.com/apache/servicecomb-service-center/eventbase/service/task"
+
"github.com/apache/servicecomb-service-center/eventbase/service/tombstone"
"github.com/apache/servicecomb-service-center/pkg/util"
_ "github.com/apache/servicecomb-service-center/test"
)
@@ -45,7 +46,7 @@ func TestSyncAddOrUpdateDependencies(t *testing.T) {
)
t.Run("register service", func(t *testing.T) {
- t.Run("create a consumer service should pass", func(t
*testing.T) {
+ t.Run("create a consumer service will create a service task
should pass", func(t *testing.T) {
resp, err :=
datasource.GetMetadataManager().RegisterService(depGetContext(),
&pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "sync_dep_group",
@@ -59,8 +60,23 @@ func TestSyncAddOrUpdateDependencies(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, pb.ResponseSuccess,
resp.Response.GetCode())
consumerId = resp.ServiceId
+ listTaskReq := model.ListTaskRequest{
+ Domain: "sync-dep",
+ Project: "sync-dep",
+ ResourceType: datasource.ResourceService,
+ Action: sync.CreateAction,
+ Status: sync.PendingStatus,
+ }
+ tasks, err := task.List(depGetContext(), &listTaskReq)
+ assert.NoError(t, err)
+ assert.Equal(t, 1, len(tasks))
+ err = task.Delete(depGetContext(), tasks...)
+ assert.NoError(t, err)
+ tasks, err = task.List(depGetContext(), &listTaskReq)
+ assert.NoError(t, err)
+ assert.Equal(t, 0, len(tasks))
})
- t.Run("create two provider services should pass", func(t
*testing.T) {
+ t.Run("create two provider services will create two service
task should pass", func(t *testing.T) {
resp, err :=
datasource.GetMetadataManager().RegisterService(depGetContext(),
&pb.CreateServiceRequest{
Service: &pb.MicroService{
AppId: "sync_dep_group",
@@ -88,11 +104,26 @@ func TestSyncAddOrUpdateDependencies(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, pb.ResponseSuccess,
resp.Response.GetCode())
providerId2 = resp.ServiceId
+ listTaskReq := model.ListTaskRequest{
+ Domain: "sync-dep",
+ Project: "sync-dep",
+ ResourceType: datasource.ResourceService,
+ Action: sync.CreateAction,
+ Status: sync.PendingStatus,
+ }
+ tasks, err := task.List(depGetContext(), &listTaskReq)
+ assert.NoError(t, err)
+ assert.Equal(t, 2, len(tasks))
+ err = task.Delete(depGetContext(), tasks...)
+ assert.NoError(t, err)
+ tasks, err = task.List(depGetContext(), &listTaskReq)
+ assert.NoError(t, err)
+ assert.Equal(t, 0, len(tasks))
})
})
t.Run("create dependencies", func(t *testing.T) {
- t.Run("create dependencies for microServices should pass",
func(t *testing.T) {
+ t.Run("create dependencies for microServices will create a
dependency task should pass", func(t *testing.T) {
consumer := &pb.MicroServiceKey{
ServiceName: "sync_dep_consumer",
AppId: "sync_dep_group",
@@ -131,7 +162,7 @@ func TestSyncAddOrUpdateDependencies(t *testing.T) {
})
t.Run("add dependencies", func(t *testing.T) {
- t.Run("add dependencies for microServices should pass", func(t
*testing.T) {
+ t.Run("add dependencies for microServices will create a
dependency task should pass", func(t *testing.T) {
consumer := &pb.MicroServiceKey{
ServiceName: "sync_dep_consumer",
AppId: "sync_dep_group",
@@ -170,7 +201,7 @@ func TestSyncAddOrUpdateDependencies(t *testing.T) {
})
t.Run("unregister consumer and provider", func(t *testing.T) {
- t.Run("unregister consumer and providers should pass", func(t
*testing.T) {
+ t.Run("unregister consumer and providers will 3 tasks and 3
tombstones should pass", func(t *testing.T) {
respDelP, err :=
datasource.GetMetadataManager().UnregisterService(depGetContext(),
&pb.DeleteServiceRequest{
ServiceId: consumerId, Force: true,
})
@@ -192,6 +223,34 @@ func TestSyncAddOrUpdateDependencies(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, pb.ResponseSuccess,
respDelP.Response.GetCode())
+ listTaskReq := model.ListTaskRequest{
+ Domain: "sync-dep",
+ Project: "sync-dep",
+ ResourceType: datasource.ResourceService,
+ Action: sync.DeleteAction,
+ Status: sync.PendingStatus,
+ }
+ tasks, err := task.List(depGetContext(), &listTaskReq)
+ assert.NoError(t, err)
+ assert.Equal(t, 3, len(tasks))
+ err = task.Delete(depGetContext(), tasks...)
+ assert.NoError(t, err)
+ tasks, err = task.List(depGetContext(), &listTaskReq)
+ assert.NoError(t, err)
+ assert.Equal(t, 0, len(tasks))
+ tombstoneListReq := model.ListTombstoneRequest{
+ Domain: "sync-dep",
+ Project: "sync-dep",
+ ResourceType: datasource.ResourceService,
+ }
+ tombstones, err := tombstone.List(context.Background(),
&tombstoneListReq)
+ assert.NoError(t, err)
+ assert.Equal(t, 3, len(tombstones))
+ err = tombstone.Delete(context.Background(),
tombstones...)
+ assert.NoError(t, err)
+ tombstones, err = tombstone.List(context.Background(),
&tombstoneListReq)
+ assert.NoError(t, err)
+ assert.Equal(t, 0, len(tombstones))
})
})
datasource.EnableSync = false
diff --git a/datasource/etcd/ms_test.go b/datasource/etcd/ms_test.go
index 4c2ba35..d752455 100644
--- a/datasource/etcd/ms_test.go
+++ b/datasource/etcd/ms_test.go
@@ -64,12 +64,12 @@ func TestSyncMicroService(t *testing.T) {
Action: sync.CreateAction,
Status: sync.PendingStatus,
}
- tasks, err := task.List(context.Background(),
&listTaskReq)
+ tasks, err := task.List(microServiceGetContext(),
&listTaskReq)
assert.NoError(t, err)
assert.Equal(t, 1, len(tasks))
- err = task.Delete(context.Background(), tasks...)
+ err = task.Delete(microServiceGetContext(), tasks...)
assert.NoError(t, err)
- tasks, err = task.List(context.Background(),
&listTaskReq)
+ tasks, err = task.List(microServiceGetContext(),
&listTaskReq)
assert.NoError(t, err)
assert.Equal(t, 0, len(tasks))
})
@@ -92,12 +92,12 @@ func TestSyncMicroService(t *testing.T) {
Action: sync.UpdateAction,
Status: sync.PendingStatus,
}
- tasks, err := task.List(context.Background(),
&listTaskReq)
+ tasks, err := task.List(microServiceGetContext(),
&listTaskReq)
assert.NoError(t, err)
assert.Equal(t, 1, len(tasks))
- err = task.Delete(context.Background(), tasks...)
+ err = task.Delete(microServiceGetContext(), tasks...)
assert.NoError(t, err)
- tasks, err = task.List(context.Background(),
&listTaskReq)
+ tasks, err = task.List(microServiceGetContext(),
&listTaskReq)
assert.NoError(t, err)
assert.Equal(t, 0, len(tasks))
})
@@ -119,12 +119,12 @@ func TestSyncMicroService(t *testing.T) {
Action: sync.DeleteAction,
Status: sync.PendingStatus,
}
- tasks, err := task.List(context.Background(),
&listTaskReq)
+ tasks, err := task.List(microServiceGetContext(),
&listTaskReq)
assert.NoError(t, err)
assert.Equal(t, 1, len(tasks))
- err = task.Delete(context.Background(), tasks...)
+ err = task.Delete(microServiceGetContext(), tasks...)
assert.NoError(t, err)
- tasks, err = task.List(context.Background(),
&listTaskReq)
+ tasks, err = task.List(microServiceGetContext(),
&listTaskReq)
assert.NoError(t, err)
assert.Equal(t, 0, len(tasks))
tombstoneListReq := model.ListTombstoneRequest{
@@ -135,7 +135,7 @@ func TestSyncMicroService(t *testing.T) {
tombstones, err := tombstone.List(context.Background(),
&tombstoneListReq)
assert.NoError(t, err)
assert.Equal(t, 1, len(tombstones))
- err = tombstone.Delete(context.Background(),
tombstones...)
+ err = tombstone.Delete(microServiceGetContext(),
tombstones...)
assert.NoError(t, err)
})
})
