summaryrefslogtreecommitdiffstats
path: root/integrations
diff options
context:
space:
mode:
authormscherer <mscherer@users.noreply.github.com>2021-12-20 21:55:05 +0100
committerGitHub <noreply@github.com>2021-12-20 20:55:05 +0000
commit57d0461ac7c84fb801c9443ae9b8da4bdadd6cea (patch)
tree8736a09354cc9ec554469d474d6b9bd0701a6c71 /integrations
parent3f34f09537726ad218e2edccbee4b670f456fcc3 (diff)
downloadgitea-57d0461ac7c84fb801c9443ae9b8da4bdadd6cea.tar.gz
gitea-57d0461ac7c84fb801c9443ae9b8da4bdadd6cea.zip
Make test work with different default branch config (#18038)
* Make test work with different default branch config On a system configured with a different default branch name, doGitInitTestRepository will create a repository with a branch named differently, and so further tests would break: --- FAIL: TestGit/HTTP/PushCreate/SuccessfullyPushAndCreateTestRepository (0.02s) git_helper_for_declarative_test.go:167: Error Trace: git_helper_for_declarative_test.go:167 Error: Received unexpected error: exit status 1 - error: src refspec master does not match any error: failed to push some refs to 'http://127.0.0.1:3003/user2/repo-tmp-push-create-http.git' Test: TestGit/HTTP/PushCreate/SuccessfullyPushAndCreateTestRepository git_test.go:587: Error Trace: git_test.go:587 Error: Received unexpected error: repository does not exist [id: 0, uid: 0, owner_name: user2, name: repo-tmp-push-create-http] Test: TestGit/HTTP/PushCreate * Update integrations/git_helper_for_declarative_test.go Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'integrations')
-rw-r--r--integrations/git_helper_for_declarative_test.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/integrations/git_helper_for_declarative_test.go b/integrations/git_helper_for_declarative_test.go
index 71473ce464..8105bcab8d 100644
--- a/integrations/git_helper_for_declarative_test.go
+++ b/integrations/git_helper_for_declarative_test.go
@@ -139,6 +139,9 @@ func doGitInitTestRepository(dstPath string) func(*testing.T) {
return func(t *testing.T) {
// Init repository in dstPath
assert.NoError(t, git.InitRepository(dstPath, false))
+ // forcibly set default branch to master
+ _, err := git.NewCommand("symbolic-ref", "HEAD", git.BranchPrefix+"master").RunInDir(dstPath)
+ assert.NoError(t, err)
assert.NoError(t, os.WriteFile(filepath.Join(dstPath, "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", dstPath)), 0644))
assert.NoError(t, git.AddChanges(dstPath, true))
signature := git.Signature{