From 93e8dfdacdb9ad829c5d044860fa352eb38b42a2 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 5 Dec 2024 22:55:21 -0800 Subject: [PATCH] Fix test --- tests/integration/pull_merge_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index 480ac4c2333..4c6b80bd71d 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -586,6 +586,8 @@ func TestPullDontRetargetChildOnWrongRepo(t *testing.T) { elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/") assert.EqualValues(t, "pulls", elemChildPR[3]) + defer test.MockVariableValue(&setting.Repository.PullRequest.RetargetChildrenOnMerge, false)() + testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true) repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})