This is an automated email from the ASF dual-hosted git repository.
zhangliang2022 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new a9aa7b254 fix(tapd): cp hexun patch and fix e2e (#5063)
a9aa7b254 is described below
commit a9aa7b2546880c0a71afd6e5e7c71209a90678e3
Author: Warren Chen <[email protected]>
AuthorDate: Fri Apr 28 14:49:56 2023 +0800
fix(tapd): cp hexun patch and fix e2e (#5063)
---
backend/plugins/tapd/e2e/bugs_commit_test.go | 6 ++++++
.../plugins/tapd/e2e/snapshot_tables/issue_repo_commits_bug.csv | 7 +++++++
.../plugins/tapd/e2e/snapshot_tables/issue_repo_commits_story.csv | 7 +++++++
.../plugins/tapd/e2e/snapshot_tables/issue_repo_commits_task.csv | 7 +++++++
backend/plugins/tapd/e2e/stories_commit_test.go | 6 ++++++
backend/plugins/tapd/e2e/tasks_commit_test.go | 6 ++++++
6 files changed, 39 insertions(+)
diff --git a/backend/plugins/tapd/e2e/bugs_commit_test.go
b/backend/plugins/tapd/e2e/bugs_commit_test.go
index 396bd0b3f..a2e0dad70 100644
--- a/backend/plugins/tapd/e2e/bugs_commit_test.go
+++ b/backend/plugins/tapd/e2e/bugs_commit_test.go
@@ -18,6 +18,7 @@ limitations under the License.
package e2e
import (
+ "github.com/apache/incubator-devlake/core/models/common"
"github.com/apache/incubator-devlake/core/models/domainlayer/crossdomain"
"github.com/apache/incubator-devlake/helpers/e2ehelper"
"github.com/apache/incubator-devlake/plugins/tapd/impl"
@@ -71,6 +72,7 @@ func TestTapdBugCommitDataFlow(t *testing.T) {
)
dataflowTester.FlushTabler(&crossdomain.IssueCommit{})
+ dataflowTester.FlushTabler(&crossdomain.IssueRepoCommit{})
dataflowTester.Subtask(tasks.ConvertBugCommitMeta, taskData)
dataflowTester.VerifyTable(
crossdomain.IssueCommit{},
@@ -80,4 +82,8 @@ func TestTapdBugCommitDataFlow(t *testing.T) {
"commit_sha",
),
)
+ dataflowTester.VerifyTableWithOptions(crossdomain.IssueRepoCommit{},
e2ehelper.TableOptions{
+ CSVRelPath: "./snapshot_tables/issue_repo_commits_bug.csv",
+ IgnoreTypes: []interface{}{common.NoPKModel{}},
+ })
}
diff --git
a/backend/plugins/tapd/e2e/snapshot_tables/issue_repo_commits_bug.csv
b/backend/plugins/tapd/e2e/snapshot_tables/issue_repo_commits_bug.csv
new file mode 100644
index 000000000..6f7ff8c4d
--- /dev/null
+++ b/backend/plugins/tapd/e2e/snapshot_tables/issue_repo_commits_bug.csv
@@ -0,0 +1,7 @@
+issue_id,repo_url,commit_sha,host,namespace,repo_name
+tapd:TapdBug:1:1137469667001000002,https://gitlab.com/merico-dev/ee/tapd-test.git,ca5cd69aa0af3fb457d1975e58db2f430eca6d7e,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdBug:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,0d55ae5b75b08ef8f657f95cd15d48ee8fcedc10,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdBug:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,461bc8c6a334c9d443fe6f147897cea1d777cb71,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdBug:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,5c908856f64c9286ec974f9088ea7825d87b8553,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdBug:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,d81557aef2025ec5a43c8d39bb2d9f18b48c9af1,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdBug:1:1137469667001009015,https://gitlab.com/merico-dev/ee/tapd-test.git,7649df9ea8c066b61955a47d66aa1983c8834033,gitlab.com,merico-dev,Tapd
Test
diff --git
a/backend/plugins/tapd/e2e/snapshot_tables/issue_repo_commits_story.csv
b/backend/plugins/tapd/e2e/snapshot_tables/issue_repo_commits_story.csv
new file mode 100644
index 000000000..8133fcf65
--- /dev/null
+++ b/backend/plugins/tapd/e2e/snapshot_tables/issue_repo_commits_story.csv
@@ -0,0 +1,7 @@
+issue_id,repo_url,commit_sha,host,namespace,repo_name
+tapd:TapdStory:1:1137469667001000002,https://gitlab.com/merico-dev/ee/tapd-test.git,ca5cd69aa0af3fb457d1975e58db2f430eca6d7e,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdStory:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,0d55ae5b75b08ef8f657f95cd15d48ee8fcedc10,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdStory:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,461bc8c6a334c9d443fe6f147897cea1d777cb71,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdStory:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,5c908856f64c9286ec974f9088ea7825d87b8553,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdStory:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,d81557aef2025ec5a43c8d39bb2d9f18b48c9af1,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdStory:1:1137469667001009015,https://gitlab.com/merico-dev/ee/tapd-test.git,7649df9ea8c066b61955a47d66aa1983c8834033,gitlab.com,merico-dev,Tapd
Test
diff --git
a/backend/plugins/tapd/e2e/snapshot_tables/issue_repo_commits_task.csv
b/backend/plugins/tapd/e2e/snapshot_tables/issue_repo_commits_task.csv
new file mode 100644
index 000000000..17f297b2d
--- /dev/null
+++ b/backend/plugins/tapd/e2e/snapshot_tables/issue_repo_commits_task.csv
@@ -0,0 +1,7 @@
+issue_id,repo_url,commit_sha,host,namespace,repo_name
+tapd:TapdTask:1:1137469667001000002,https://gitlab.com/merico-dev/ee/tapd-test.git,ca5cd69aa0af3fb457d1975e58db2f430eca6d7e,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdTask:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,0d55ae5b75b08ef8f657f95cd15d48ee8fcedc10,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdTask:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,461bc8c6a334c9d443fe6f147897cea1d777cb71,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdTask:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,5c908856f64c9286ec974f9088ea7825d87b8553,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdTask:1:1137469667001000006,https://gitlab.com/merico-dev/ee/tapd-test.git,d81557aef2025ec5a43c8d39bb2d9f18b48c9af1,gitlab.com,merico-dev,Tapd
Test
+tapd:TapdTask:1:1137469667001009015,https://gitlab.com/merico-dev/ee/tapd-test.git,7649df9ea8c066b61955a47d66aa1983c8834033,gitlab.com,merico-dev,Tapd
Test
diff --git a/backend/plugins/tapd/e2e/stories_commit_test.go
b/backend/plugins/tapd/e2e/stories_commit_test.go
index c2f21d119..d6b63254b 100644
--- a/backend/plugins/tapd/e2e/stories_commit_test.go
+++ b/backend/plugins/tapd/e2e/stories_commit_test.go
@@ -18,6 +18,7 @@ limitations under the License.
package e2e
import (
+ "github.com/apache/incubator-devlake/core/models/common"
"github.com/apache/incubator-devlake/core/models/domainlayer/crossdomain"
"github.com/apache/incubator-devlake/helpers/e2ehelper"
"github.com/apache/incubator-devlake/plugins/tapd/impl"
@@ -70,6 +71,7 @@ func TestTapdStoryCommitDataFlow(t *testing.T) {
)
dataflowTester.FlushTabler(&crossdomain.IssueCommit{})
+ dataflowTester.FlushTabler(&crossdomain.IssueRepoCommit{})
dataflowTester.Subtask(tasks.ConvertStoryCommitMeta, taskData)
dataflowTester.VerifyTable(
crossdomain.IssueCommit{},
@@ -79,4 +81,8 @@ func TestTapdStoryCommitDataFlow(t *testing.T) {
"commit_sha",
),
)
+ dataflowTester.VerifyTableWithOptions(crossdomain.IssueRepoCommit{},
e2ehelper.TableOptions{
+ CSVRelPath: "./snapshot_tables/issue_repo_commits_story.csv",
+ IgnoreTypes: []interface{}{common.NoPKModel{}},
+ })
}
diff --git a/backend/plugins/tapd/e2e/tasks_commit_test.go
b/backend/plugins/tapd/e2e/tasks_commit_test.go
index c7f6720d3..40eb51b9e 100644
--- a/backend/plugins/tapd/e2e/tasks_commit_test.go
+++ b/backend/plugins/tapd/e2e/tasks_commit_test.go
@@ -18,6 +18,7 @@ limitations under the License.
package e2e
import (
+ "github.com/apache/incubator-devlake/core/models/common"
"github.com/apache/incubator-devlake/core/models/domainlayer/crossdomain"
"github.com/apache/incubator-devlake/helpers/e2ehelper"
"github.com/apache/incubator-devlake/plugins/tapd/impl"
@@ -71,6 +72,7 @@ func TestTapdTaskCommitDataFlow(t *testing.T) {
)
dataflowTester.FlushTabler(&crossdomain.IssueCommit{})
+ dataflowTester.FlushTabler(&crossdomain.IssueRepoCommit{})
dataflowTester.Subtask(tasks.ConvertTaskCommitMeta, taskData)
dataflowTester.VerifyTable(
crossdomain.IssueCommit{},
@@ -80,4 +82,8 @@ func TestTapdTaskCommitDataFlow(t *testing.T) {
"commit_sha",
),
)
+ dataflowTester.VerifyTableWithOptions(crossdomain.IssueRepoCommit{},
e2ehelper.TableOptions{
+ CSVRelPath: "./snapshot_tables/issue_repo_commits_task.csv",
+ IgnoreTypes: []interface{}{common.NoPKModel{}},
+ })
}
