Selaa lähdekoodia

Fix integration tests (#3141)

tags/v1.4.0-rc1
Ethan Koenig 6 vuotta sitten
vanhempi
commit
d1efe2078a
2 muutettua tiedostoa jossa 10 lisäystä ja 4 poistoa
  1. 1
    0
      integrations/integration_test.go
  2. 9
    4
      models/repo.go

+ 1
- 0
integrations/integration_test.go Näytä tiedosto

@@ -136,6 +136,7 @@ func initIntegrationTest() {
func prepareTestEnv(t testing.TB) {
assert.NoError(t, models.LoadFixtures())
assert.NoError(t, os.RemoveAll(setting.RepoRootPath))
assert.NoError(t, os.RemoveAll(models.LocalCopyPath()))

assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"),
setting.RepoRootPath))

+ 9
- 4
models/repo.go Näytä tiedosto

@@ -757,12 +757,17 @@ func (repo *Repository) DescriptionHTML() template.HTML {
return template.HTML(descPattern.ReplaceAllStringFunc(markup.Sanitize(repo.Description), sanitize))
}

// LocalCopyPath returns the local repository copy path
func (repo *Repository) LocalCopyPath() string {
// LocalCopyPath returns the local repository copy path.
func LocalCopyPath() string {
if filepath.IsAbs(setting.Repository.Local.LocalCopyPath) {
return path.Join(setting.Repository.Local.LocalCopyPath, com.ToStr(repo.ID))
return setting.Repository.Local.LocalCopyPath
}
return path.Join(setting.AppDataPath, setting.Repository.Local.LocalCopyPath, com.ToStr(repo.ID))
return path.Join(setting.AppDataPath, setting.Repository.Local.LocalCopyPath)
}

// LocalCopyPath returns the local repository copy path for the given repo.
func (repo *Repository) LocalCopyPath() string {
return path.Join(LocalCopyPath(), com.ToStr(repo.ID))
}

// UpdateLocalCopyBranch pulls latest changes of given branch from repoPath to localPath.

Loading…
Peruuta
Tallenna