diff options
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/git_helper_for_declarative_test.go | 9 | ||||
| -rw-r--r-- | integrations/integration_test.go | 7 | ||||
| -rw-r--r-- | integrations/migration-test/migration_test.go | 3 |
3 files changed, 9 insertions, 10 deletions
diff --git a/integrations/git_helper_for_declarative_test.go b/integrations/git_helper_for_declarative_test.go index f681cd143a..d99d80a7c7 100644 --- a/integrations/git_helper_for_declarative_test.go +++ b/integrations/git_helper_for_declarative_test.go @@ -24,7 +24,6 @@ import ( "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" - "github.com/unknwon/com" ) func withKeyFile(t *testing.T, keyname string, callback func(string)) { @@ -112,7 +111,9 @@ func onGiteaRun(t *testing.T, callback func(*testing.T, *url.URL), prepare ...bo func doGitClone(dstLocalPath string, u *url.URL) func(*testing.T) { return func(t *testing.T) { assert.NoError(t, git.CloneWithArgs(context.Background(), u.String(), dstLocalPath, allowLFSFilters(), git.CloneRepoOptions{})) - assert.True(t, com.IsExist(filepath.Join(dstLocalPath, "README.md"))) + exist, err := util.IsExist(filepath.Join(dstLocalPath, "README.md")) + assert.NoError(t, err) + assert.True(t, exist) } } @@ -122,7 +123,9 @@ func doGitCloneFail(u *url.URL) func(*testing.T) { assert.NoError(t, err) defer util.RemoveAll(tmpDir) assert.Error(t, git.Clone(u.String(), tmpDir, git.CloneRepoOptions{})) - assert.False(t, com.IsExist(filepath.Join(tmpDir, "README.md"))) + exist, err := util.IsExist(filepath.Join(tmpDir, "README.md")) + assert.NoError(t, err) + assert.False(t, exist) } } diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 00aba15603..f3b2644c78 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -37,7 +37,6 @@ import ( "github.com/PuerkitoBio/goquery" "github.com/go-chi/chi" "github.com/stretchr/testify/assert" - "github.com/unknwon/com" ) var c chi.Router @@ -231,8 +230,7 @@ func prepareTestEnv(t testing.TB, skip ...int) func() { assert.NoError(t, models.LoadFixtures()) assert.NoError(t, util.RemoveAll(setting.RepoRootPath)) - assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), - setting.RepoRootPath)) + assert.NoError(t, util.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath)) return deferFn } @@ -473,6 +471,5 @@ func resetFixtures(t *testing.T) { assert.NoError(t, queue.GetManager().FlushAll(context.Background(), -1)) assert.NoError(t, models.LoadFixtures()) assert.NoError(t, util.RemoveAll(setting.RepoRootPath)) - assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), - setting.RepoRootPath)) + assert.NoError(t, util.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath)) } diff --git a/integrations/migration-test/migration_test.go b/integrations/migration-test/migration_test.go index 19a132054f..852c0b737c 100644 --- a/integrations/migration-test/migration_test.go +++ b/integrations/migration-test/migration_test.go @@ -27,7 +27,6 @@ import ( "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" - "github.com/unknwon/com" "xorm.io/xorm" ) @@ -60,7 +59,7 @@ func initMigrationTest(t *testing.T) func() { assert.True(t, len(setting.RepoRootPath) != 0) assert.NoError(t, util.RemoveAll(setting.RepoRootPath)) - assert.NoError(t, com.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath)) + assert.NoError(t, util.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath)) setting.CheckLFSVersion() setting.InitDBConfig() |