git-workflow/autogits
SHA256
19
0
Fork 8
Code Issues 44 Pull Requests 6 Projects 2 Activity

reviewers fix in tests

Browse Source
This commit is contained in:
Adam Majer
2025-02-06 17:17:06 +01:00
parent e537e5d00c
commit efde2fad69
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-pr/pr.go
View File

@@ -4,6 +4,7 @@ import (
"bufio" "bufio"
"errors" "errors"
"fmt" "fmt"
"log"
"os" "os"
"path" "path"
"slices" "slices"
@@ -115,6 +116,7 @@ func (rs *PRSet) IsReviewed(gitea common.GiteaReviewFetcher) bool {
reviewers = configReviewers.Pkg reviewers = configReviewers.Pkg
} }
log.Println(reviewers)
r, err := FetchGiteaReviews(gitea, reviewers, pr.pr.Base.Repo.Owner.UserName, pr.pr.Base.Repo.Name, pr.pr.Index) r, err := FetchGiteaReviews(gitea, reviewers, pr.pr.Base.Repo.Owner.UserName, pr.pr.Base.Repo.Name, pr.pr.Index)
if err != nil { if err != nil {
return false return false

12
workflow-pr/pr_test.go
View File

@@ -102,7 +102,7 @@ func TestPR(t *testing.T) {
{ {
pr: &models.PullRequest{Body: "", Index: 42, Base: &models.PRBranchInfo{Repo: &models.Repository{Name: "barPrj", Owner: &models.User{UserName: "foo"}}}}, pr: &models.PullRequest{Body: "", Index: 42, Base: &models.PRBranchInfo{Repo: &models.Repository{Name: "barPrj", Owner: &models.User{UserName: "foo"}}}},
reviews: []*models.PullReview{ reviews: []*models.PullReview{
{Body: "LGTM", User: &models.User{UserName: "super1"}, State: common.ReviewStateApproved}, {Body: "LGTM", User: &models.User{UserName: "m2"}, State: common.ReviewStateApproved},
{Body: "LGTM", User: &models.User{UserName: "super2"}, State: common.ReviewStateApproved}, {Body: "LGTM", User: &models.User{UserName: "super2"}, State: common.ReviewStateApproved},
{Body: "LGTM", User: &models.User{UserName: common.Bot_BuildReview}, State: common.ReviewStateApproved}, {Body: "LGTM", User: &models.User{UserName: common.Bot_BuildReview}, State: common.ReviewStateApproved},
}, },
@@ -243,13 +243,13 @@ func TestPRMerge(t *testing.T) {
} }
config := &common.AutogitConfig{ config := &common.AutogitConfig{
Organization: "org", Organization: "org",
GitProjectName: "prj", GitProjectName: "prj",
} }
tests := []struct { tests := []struct {
name string name string
pr *models.PullRequest pr *models.PullRequest
mergeError string mergeError string
}{ }{
{ {
@@ -266,7 +266,7 @@ func TestPRMerge(t *testing.T) {
SSHURL: path.Join(cmd.Dir, "prjgit"), SSHURL: path.Join(cmd.Dir, "prjgit"),
}, },
}, },
Head: &models.PRBranchInfo { Head: &models.PRBranchInfo{
Sha: "88584433de1c917c1d773f62b82381848d882491940b5e9b427a540aa9057d9a", // "base_add_b2" Sha: "88584433de1c917c1d773f62b82381848d882491940b5e9b427a540aa9057d9a", // "base_add_b2"
}, },
}, },
@@ -286,7 +286,7 @@ func TestPRMerge(t *testing.T) {
SSHURL: path.Join(cmd.Dir, "prjgit"), SSHURL: path.Join(cmd.Dir, "prjgit"),
}, },
}, },
Head: &models.PRBranchInfo { Head: &models.PRBranchInfo{
Sha: "88584433de1c917c1d773f62b82381848d882491940b5e9b427a540aa9057d9a", // "base_add_b2" Sha: "88584433de1c917c1d773f62b82381848d882491940b5e9b427a540aa9057d9a", // "base_add_b2"
}, },
}, },