diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2022-06-11 11:56:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-11 11:56:27 +0800 |
| commit | 88f2e457d891c4e91a9eddab8143d0109e08dfa9 (patch) | |
| tree | 7746767e490260ddfb2e28d3d9e142c29d3b2a14 /models | |
| parent | 23422f9909e9843308b4c6f2becca9ba1ad5cef2 (diff) | |
| download | gitea-88f2e457d891c4e91a9eddab8143d0109e08dfa9.tar.gz gitea-88f2e457d891c4e91a9eddab8143d0109e08dfa9.zip | |
Fix data-race problems in git module (quick patch) (#19934)
* Fix data-race problems in git module
* use HomeDir instead of setting.RepoRootPath
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'models')
| -rw-r--r-- | models/migrations/migrations_test.go | 2 | ||||
| -rw-r--r-- | models/unittest/testdb.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go index 2c4d21d974..0c8e74f734 100644 --- a/models/migrations/migrations_test.go +++ b/models/migrations/migrations_test.go @@ -203,7 +203,7 @@ func prepareTestEnv(t *testing.T, skip int, syncModels ...interface{}) (*xorm.En deferFn := PrintCurrentTest(t, ourSkip) assert.NoError(t, os.RemoveAll(setting.RepoRootPath)) assert.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath)) - assert.NoError(t, git.InitWithConfigSync(context.Background())) + assert.NoError(t, git.InitOnceWithSync(context.Background())) ownerDirs, err := os.ReadDir(setting.RepoRootPath) if err != nil { assert.NoError(t, err, "unable to read the new repo root: %v\n", err) diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 2a366836fe..d1a4498510 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -117,7 +117,7 @@ func MainTest(m *testing.M, testOpts *TestOptions) { if err = CopyDir(filepath.Join(testOpts.GiteaRootPath, "integrations", "gitea-repositories-meta"), setting.RepoRootPath); err != nil { fatalTestError("util.CopyDir: %v\n", err) } - if err = git.InitWithConfigSync(context.Background()); err != nil { + if err = git.InitOnceWithSync(context.Background()); err != nil { fatalTestError("git.Init: %v\n", err) } @@ -202,7 +202,7 @@ func PrepareTestEnv(t testing.TB) { assert.NoError(t, util.RemoveAll(setting.RepoRootPath)) metaPath := filepath.Join(giteaRoot, "integrations", "gitea-repositories-meta") assert.NoError(t, CopyDir(metaPath, setting.RepoRootPath)) - assert.NoError(t, git.InitWithConfigSync(context.Background())) + assert.NoError(t, git.InitOnceWithSync(context.Background())) ownerDirs, err := os.ReadDir(setting.RepoRootPath) assert.NoError(t, err) |