tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

debug branches
Some checks failed
ci/woodpecker/pr/build Pipeline was successful
Details
testing / backend-checks (pull_request) Successful in 5m26s
Details
ci/woodpecker/push/build Pipeline was successful
Details
testing / frontend-checks (pull_request) Successful in 1m25s
Details
/ release-notes (pull_request_target) Has been skipped
Details
testing / test-unit (pull_request) Successful in 6m48s
Details
testing / test-e2e (pull_request) Successful in 2m36s
Details
testing / test-mysql (pull_request) Failing after 51m13s
Details
testing / test-remote-cacher (map[image:docker.io/bitnami/redis:7.2 port:6379]) (pull_request) Has been cancelled
Details
testing / test-remote-cacher (map[image:docker.io/bitnami/valkey:7.2 port:6379]) (pull_request) Has been cancelled
Details
testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (pull_request) Has been cancelled
Details
testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (pull_request) Has been cancelled
Details
testing / test-sqlite (pull_request) Has been cancelled
Details
testing / security-check (pull_request) Has been cancelled
Details
testing / test-pgsql (pull_request) Has been cancelled
Details

Browse source
This commit is contained in:
Tom Neuber 2024-10-26 19:11:01 +02:00
parent 6a7085a7fe
commit 4ab43fd3db
Signed by: tom
GPG key ID: F17EFE4272D89FF6
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/integration/pull_merge_test.go
View file

@ -963,9 +963,9 @@ func TestPullAutoMergeWithBranchDeletionAfterCommitStatusSucceed(t *testing.T) {
session.MakeRequest(t, req, http.StatusSeeOther)
// check if new branch exists
forkGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, forkedRepo)
forkedGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, forkedRepo)
require.NoError(t, err)
newBranch, err := forkGitRepo.GetBranch("new_branch_1")
newBranch, err := forkedGitRepo.GetBranch("new_branch_1")
require.NoError(t, err)
assert.NotNil(t, newBranch)
@ -1017,9 +1017,13 @@ func TestPullAutoMergeWithBranchDeletionAfterCommitStatusSucceed(t *testing.T) {
unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID})
// check if new branch got removed
forkGitRepo, err = gitrepo.OpenRepository(db.DefaultContext, forkedRepo)
forkedGitRepo, err = gitrepo.OpenRepository(db.DefaultContext, forkedRepo)
require.NoError(t, err)
_, err = forkGitRepo.GetBranch("new_branch_1")
branches, _, err = forkedGitRepo.GetBranchNames(0, 100)
require.NoError(t, err)
t.Log(branches)
_, err = forkedGitRepo.GetBranch("new_branch_1")
require.Error(t, err)
assert.True(t, git.IsErrBranchNotExist(err))
})
}