Skip to content

Commit 0110c72

Browse files
wxiaoguangwxiaoguang
committed
try to clean up
1 parent 7ed98bf commit 0110c72

File tree

4 files changed

+0
-95
lines changed

4 files changed

+0
-95
lines changed

‎models/migrations/base/tests.go

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,6 @@ func PrepareTestEnv(t *testing.T, skip int, syncModels ...any) (*xorm.Engine, fu
3535
ourSkip += skip
3636
deferFn := testlogger.PrintCurrentTest(t, ourSkip)
3737
assert.NoError(t, unittest.SyncDirs(filepath.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
38-
ownerDirs, err := os.ReadDir(setting.RepoRootPath)
39-
if err != nil {
40-
assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
41-
}
42-
for _, ownerDir := range ownerDirs {
43-
if !ownerDir.Type().IsDir() {
44-
continue
45-
}
46-
repoDirs, err := os.ReadDir(filepath.Join(setting.RepoRootPath, ownerDir.Name()))
47-
if err != nil {
48-
assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
49-
}
50-
for _, repoDir := range repoDirs {
51-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "pack"), 0o755)
52-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "info"), 0o755)
53-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "heads"), 0o755)
54-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "tag"), 0o755)
55-
}
56-
}
5738

5839
if err := deleteDB(); err != nil {
5940
t.Errorf("unable to reset database: %v", err)

‎models/unittest/testdb.go

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -171,25 +171,6 @@ func MainTest(m *testing.M, testOpts ...*TestOptions) {
171171
if err = git.InitFull(context.Background()); err != nil {
172172
fatalTestError("git.Init: %v\n", err)
173173
}
174-
ownerDirs, err := os.ReadDir(setting.RepoRootPath)
175-
if err != nil {
176-
fatalTestError("unable to read the new repo root: %v\n", err)
177-
}
178-
for _, ownerDir := range ownerDirs {
179-
if !ownerDir.Type().IsDir() {
180-
continue
181-
}
182-
repoDirs, err := os.ReadDir(filepath.Join(setting.RepoRootPath, ownerDir.Name()))
183-
if err != nil {
184-
fatalTestError("unable to read the new repo root: %v\n", err)
185-
}
186-
for _, repoDir := range repoDirs {
187-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "pack"), 0o755)
188-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "info"), 0o755)
189-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "heads"), 0o755)
190-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "tag"), 0o755)
191-
}
192-
}
193174

194175
if len(testOpts) > 0 && testOpts[0].SetUp != nil {
195176
if err := testOpts[0].SetUp(); err != nil {
@@ -254,21 +235,5 @@ func PrepareTestEnv(t testing.TB) {
254235
assert.NoError(t, PrepareTestDatabase())
255236
metaPath := filepath.Join(giteaRoot, "tests", "gitea-repositories-meta")
256237
assert.NoError(t, SyncDirs(metaPath, setting.RepoRootPath))
257-
ownerDirs, err := os.ReadDir(setting.RepoRootPath)
258-
assert.NoError(t, err)
259-
for _, ownerDir := range ownerDirs {
260-
if !ownerDir.Type().IsDir() {
261-
continue
262-
}
263-
repoDirs, err := os.ReadDir(filepath.Join(setting.RepoRootPath, ownerDir.Name()))
264-
assert.NoError(t, err)
265-
for _, repoDir := range repoDirs {
266-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "pack"), 0o755)
267-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "info"), 0o755)
268-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "heads"), 0o755)
269-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "tag"), 0o755)
270-
}
271-
}
272-
273238
base.SetupGiteaRoot() // Makes sure GITEA_ROOT is set
274239
}

‎tests/integration/migration-test/migration_test.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,6 @@ func initMigrationTest(t *testing.T) func() {
6565

6666
assert.True(t, len(setting.RepoRootPath) != 0)
6767
assert.NoError(t, unittest.SyncDirs(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
68-
ownerDirs, err := os.ReadDir(setting.RepoRootPath)
69-
if err != nil {
70-
assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
71-
}
72-
for _, ownerDir := range ownerDirs {
73-
if !ownerDir.Type().IsDir() {
74-
continue
75-
}
76-
repoDirs, err := os.ReadDir(filepath.Join(setting.RepoRootPath, ownerDir.Name()))
77-
if err != nil {
78-
assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
79-
}
80-
for _, repoDir := range repoDirs {
81-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "pack"), 0o755)
82-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "info"), 0o755)
83-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "heads"), 0o755)
84-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "tag"), 0o755)
85-
}
86-
}
87-
8868
assert.NoError(t, git.InitFull(context.Background()))
8969
setting.LoadDBSetting()
9070
setting.InitLoggersForTest()

‎tests/test_utils.go

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -196,27 +196,6 @@ func PrepareGitRepoDirectory(t testing.TB) {
196196
return
197197
}
198198
assert.NoError(t, unittest.SyncDirs(filepath.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath))
199-
200-
ownerDirs, err := os.ReadDir(setting.RepoRootPath)
201-
if err != nil {
202-
assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
203-
}
204-
for _, ownerDir := range ownerDirs {
205-
if !ownerDir.Type().IsDir() {
206-
continue
207-
}
208-
repoDirs, err := os.ReadDir(filepath.Join(setting.RepoRootPath, ownerDir.Name()))
209-
if err != nil {
210-
assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
211-
}
212-
for _, repoDir := range repoDirs {
213-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "pack"), 0o755)
214-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "info"), 0o755)
215-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "heads"), 0o755)
216-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "tag"), 0o755)
217-
_ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "pull"), 0o755)
218-
}
219-
}
220199
}
221200

222201
func PrepareArtifactsStorage(t testing.TB) {

0 commit comments

Comments
 (0)