You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by GitBox <gi...@apache.org> on 2021/12/22 08:51:05 UTC
[GitHub] [servicecomb-service-center] robotLJW opened a new pull request #1185: [feat] add task and tombstone ut in eventbase
robotLJW opened a new pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185
Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes.
- [ ] Each commit in the pull request should have a meaningful subject line and body.
- [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue.
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
- [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
- [ ] Never comment source code, delete it.
- [ ] UT should has "context, subject, expected result" result as test case name, when you call t.Run().
---
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774891751
##########
File path: eventbase/README.md
##########
@@ -0,0 +1,15 @@
+# eventbase
+
+eventbase provides the crud interface of task and tombstone.
+
+### package
+
+**bootstrap**：used to start initial loading.
+
+**datasource**: realize the dao operation of etcd and mongo on task and tombstone.
+
+**request**: task and tombstone request.
Review comment:
request是否没必要专门提供一个pkg，直接放到service
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] robotLJW commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
robotLJW commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774897281
##########
File path: eventbase/README.md
##########
@@ -0,0 +1,15 @@
+# eventbase
+
+eventbase provides the crud interface of task and tombstone.
+
+### package
+
+**bootstrap**：used to start initial loading.
+
+**datasource**: realize the dao operation of etcd and mongo on task and tombstone.
+
+**request**: task and tombstone request.
Review comment:
这边是这样 因为这个request 会传到 dao 这边的接口
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774890191
##########
File path: eventbase/test/ssl/cert_pwd
##########
@@ -0,0 +1 @@
+Changeme_123
Review comment:
不必考虑paasphase了，已经被证实有漏洞了
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] little-cui commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
little-cui commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774275238
##########
File path: eventbase/service/task/task_svc_test.go
##########
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package task_test
+
+import (
+ "context"
+ "testing"
+
+ "github.com/go-chassis/cari/sync"
+ "github.com/stretchr/testify/assert"
+
+ "github.com/apache/servicecomb-service-center/eventbase/datasource"
+ "github.com/apache/servicecomb-service-center/eventbase/request"
+ "github.com/apache/servicecomb-service-center/eventbase/service/task"
+ "github.com/apache/servicecomb-service-center/eventbase/test"
+)
+
+func init() {
+ err := datasource.Init(test.DbCfg)
+ if err != nil {
+ panic(err)
+ }
+}
+
+func TestTaskService(t *testing.T) {
+ taskOne, _ := sync.NewTask("default", "default", sync.CreateAction, "config")
+ taskTwo, _ := sync.NewTask("default", "default", sync.UpdateAction, "config")
+ taskThree, _ := sync.NewTask("default", "default", sync.DeleteAction, "config")
+ t.Run("to create three tasks for next delete update and list operations, should pass", func(t *testing.T) {
+ _, err := datasource.GetDataSource().TaskDao().Create(context.Background(), taskOne)
+ assert.Nil(t, err)
+ _, err = datasource.GetDataSource().TaskDao().Create(context.Background(), taskTwo)
+ assert.Nil(t, err)
+ _, err = datasource.GetDataSource().TaskDao().Create(context.Background(), taskThree)
+ assert.Nil(t, err)
+ })
+
+ t.Run("list task service", func(t *testing.T) {
+ t.Run("list task with default domain and default project should pass", func(t *testing.T) {
+ listReq := request.ListTaskRequest{
+ Domain: "default",
+ Project: "default",
+ }
+ tasks, err := task.List(context.Background(), &listReq)
+ assert.Nil(t, err)
+ assert.NotEqual(t, 0, len(tasks))
Review comment:
UT断言不严谨，其他也看下
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774891244
##########
File path: eventbase/datasource/etcd/task/task_dao_test.go
##########
@@ -141,6 +138,13 @@ func TestTask(t *testing.T) {
t.Run("delete tasks should pass", func(t *testing.T) {
err := ds.TaskDao().Delete(context.Background(), []*sync.Task{&task, &taskTwo, &taskThree}...)
assert.NoError(t, err)
+ opts := []datasource.TaskFindOption{
+ datasource.WithDomain("default"),
Review comment:
这里没错，不要被我上一个comment引导错误，因为domain和project不该提供默认值，我认为2个都是不该有默认值的，所以的确应该指明参数来查询
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] robotLJW commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
robotLJW commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774907396
##########
File path: eventbase/README.md
##########
@@ -0,0 +1,15 @@
+# eventbase
+
+eventbase provides the crud interface of task and tombstone.
+
+### package
+
+**bootstrap**：used to start initial loading.
+
+**datasource**: realize the dao operation of etcd and mongo on task and tombstone.
+
+**request**: task and tombstone request.
Review comment:
我这边将request改成domain
##########
File path: eventbase/datasource/tlsutil/tlsutil_test.go
##########
@@ -29,7 +29,7 @@ import (
"github.com/apache/servicecomb-service-center/eventbase/datasource/tlsutil"
)
-const sslRoot = "./../../../examples/service_center/ssl/"
+const sslRoot = "./../../test/ssl/"
Review comment:
已经删除
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] robotLJW commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
robotLJW commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774891664
##########
File path: eventbase/test/ssl/cert_pwd
##########
@@ -0,0 +1 @@
+Changeme_123
Review comment:
那这边的test用力删除？
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774890406
##########
File path: eventbase/datasource/mongo/tombstone/tombstone_dao_test.go
##########
@@ -87,10 +89,10 @@ func TestTombstone(t *testing.T) {
})
t.Run("list tombstone", func(t *testing.T) {
- t.Run("list tombstone with ResourceType and BeforeTimestamp should pass", func(t *testing.T) {
+ t.Run("list tombstone with Domain, Project ,ResourceType and BeforeTimestamp should pass", func(t *testing.T) {
opts := []datasource.TombstoneFindOption{
datasource.WithTombstoneDomain("default"),
- datasource.WithTombstoneProject("default"),
+ datasource.WithTombstoneDomain("default"),
Review comment:
作为默认就不该让调用方自己填默认值
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
tianxiaoliang merged pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r775787781
##########
File path: eventbase/service/tombstone/tombstone_svc.go
##########
@@ -23,18 +23,18 @@ import (
"github.com/go-chassis/cari/sync"
"github.com/apache/servicecomb-service-center/eventbase/datasource"
- "github.com/apache/servicecomb-service-center/eventbase/request"
+ "github.com/apache/servicecomb-service-center/eventbase/domain"
Review comment:
叫model吧，保持风格一致
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774892026
##########
File path: eventbase/datasource/tlsutil/tlsutil_test.go
##########
@@ -29,7 +29,7 @@ import (
"github.com/apache/servicecomb-service-center/eventbase/datasource/tlsutil"
)
-const sslRoot = "./../../../examples/service_center/ssl/"
+const sslRoot = "./../../test/ssl/"
Review comment:
请不要再上传任何测试文件，go的test pkg现在提供临时目录特性，google下
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] robotLJW commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
robotLJW commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r775802397
##########
File path: eventbase/datasource/etcd/task/task_dao_test.go
##########
@@ -46,29 +43,29 @@ func init() {
func TestTask(t *testing.T) {
Review comment:
确实，测试用例应该抽取到上层的service，我这边的测试用例还是有重复，为了减少ci的时延，还是先删除了
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] robotLJW commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
robotLJW commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r775801999
##########
File path: eventbase/service/tombstone/tombstone_svc.go
##########
@@ -23,18 +23,18 @@ import (
"github.com/go-chassis/cari/sync"
"github.com/apache/servicecomb-service-center/eventbase/datasource"
- "github.com/apache/servicecomb-service-center/eventbase/request"
+ "github.com/apache/servicecomb-service-center/eventbase/domain"
Review comment:
已经修改成 model
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r775790164
##########
File path: eventbase/datasource/etcd/task/task_dao_test.go
##########
@@ -46,29 +43,29 @@ func init() {
func TestTask(t *testing.T) {
Review comment:
UT应该提交到更上层，不要依赖具体实现，比如etcd，而是针对接口做测试，UT里控制具体实现
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] robotLJW commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
robotLJW commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774283313
##########
File path: eventbase/service/task/task_svc_test.go
##########
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package task_test
+
+import (
+ "context"
+ "testing"
+
+ "github.com/go-chassis/cari/sync"
+ "github.com/stretchr/testify/assert"
+
+ "github.com/apache/servicecomb-service-center/eventbase/datasource"
+ "github.com/apache/servicecomb-service-center/eventbase/request"
+ "github.com/apache/servicecomb-service-center/eventbase/service/task"
+ "github.com/apache/servicecomb-service-center/eventbase/test"
+)
+
+func init() {
+ err := datasource.Init(test.DbCfg)
+ if err != nil {
+ panic(err)
+ }
+}
+
+func TestTaskService(t *testing.T) {
+ taskOne, _ := sync.NewTask("default", "default", sync.CreateAction, "config")
+ taskTwo, _ := sync.NewTask("default", "default", sync.UpdateAction, "config")
+ taskThree, _ := sync.NewTask("default", "default", sync.DeleteAction, "config")
+ t.Run("to create three tasks for next delete update and list operations, should pass", func(t *testing.T) {
+ _, err := datasource.GetDataSource().TaskDao().Create(context.Background(), taskOne)
+ assert.Nil(t, err)
+ _, err = datasource.GetDataSource().TaskDao().Create(context.Background(), taskTwo)
+ assert.Nil(t, err)
+ _, err = datasource.GetDataSource().TaskDao().Create(context.Background(), taskThree)
+ assert.Nil(t, err)
+ })
+
+ t.Run("list task service", func(t *testing.T) {
+ t.Run("list task with default domain and default project should pass", func(t *testing.T) {
+ listReq := request.ListTaskRequest{
+ Domain: "default",
+ Project: "default",
+ }
+ tasks, err := task.List(context.Background(), &listReq)
+ assert.Nil(t, err)
+ assert.NotEqual(t, 0, len(tasks))
Review comment:
增加了更详细的判断，下面相关的测试用例已经修复
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] robotLJW commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
robotLJW commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r774270125
##########
File path: eventbase/service/task/task_svc_test.go
##########
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package task_test
+
+import (
+ "context"
+ "testing"
+
+ "github.com/go-chassis/cari/sync"
+ "github.com/stretchr/testify/assert"
+
+ _ "github.com/apache/servicecomb-service-center/eventbase/bootstrap"
Review comment:
已经将其放入test包的 import 中
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [servicecomb-service-center] little-cui commented on a change in pull request #1185: [feat] add task and tombstone ut in eventbase
Posted by GitBox <gi...@apache.org>.
little-cui commented on a change in pull request #1185:
URL: https://github.com/apache/servicecomb-service-center/pull/1185#discussion_r773856847
##########
File path: eventbase/service/task/task_svc_test.go
##########
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package task_test
+
+import (
+ "context"
+ "testing"
+
+ "github.com/go-chassis/cari/sync"
+ "github.com/stretchr/testify/assert"
+
+ _ "github.com/apache/servicecomb-service-center/eventbase/bootstrap"
Review comment:
应该放到 test 包里统一导入，供其他test.go使用
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org