From 2f682b65abd2de6c7b9516a148a4493af6e1a90b Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Sun, 19 Feb 2023 11:43:58 +0000 Subject: [PATCH 1/2] Remove all package data after tests. --- tests/integration/api_packages_cargo_test.go | 2 + tests/integration/api_packages_chef_test.go | 1 + .../integration/api_packages_composer_test.go | 2 + tests/integration/api_packages_conan_test.go | 2 + tests/integration/api_packages_conda_test.go | 1 + .../api_packages_container_test.go | 3 +- .../integration/api_packages_generic_test.go | 2 + tests/integration/api_packages_helm_test.go | 2 + tests/integration/api_packages_maven_test.go | 2 + tests/integration/api_packages_npm_test.go | 2 + tests/integration/api_packages_nuget_test.go | 1 + tests/integration/api_packages_pub_test.go | 2 + tests/integration/api_packages_pypi_test.go | 2 + .../integration/api_packages_rubygems_test.go | 2 + tests/integration/api_packages_test.go | 53 +++++++++++++++++-- 15 files changed, 74 insertions(+), 5 deletions(-) diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go index 0c542eaf1e85..3cac8d9c03a2 100644 --- a/tests/integration/api_packages_cargo_test.go +++ b/tests/integration/api_packages_cargo_test.go @@ -30,6 +30,8 @@ import ( ) func TestPackageCargo(t *testing.T) { + defer removeAllPackageData(t) + onGiteaRun(t, testPackageCargo) } diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go index 14baddca9428..3644839c3a40 100644 --- a/tests/integration/api_packages_chef_test.go +++ b/tests/integration/api_packages_chef_test.go @@ -39,6 +39,7 @@ import ( func TestPackageChef(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index 87647cc47535..7a1c7d00bd94 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -25,6 +25,8 @@ import ( func TestPackageComposer(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) vendorName := "gitea" diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go index 5ced388b4858..4bc32309f961 100644 --- a/tests/integration/api_packages_conan_test.go +++ b/tests/integration/api_packages_conan_test.go @@ -205,6 +205,8 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha func TestPackageConan(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) name := "ConanPackage" diff --git a/tests/integration/api_packages_conda_test.go b/tests/integration/api_packages_conda_test.go index daa7dca55fa2..779fadfc92f4 100644 --- a/tests/integration/api_packages_conda_test.go +++ b/tests/integration/api_packages_conda_test.go @@ -26,6 +26,7 @@ import ( func TestPackageConda(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go index 3d9319f37001..cf502b71df2d 100644 --- a/tests/integration/api_packages_container_test.go +++ b/tests/integration/api_packages_container_test.go @@ -30,6 +30,7 @@ import ( func TestPackageContainer(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) session := loginUser(t, user.Name) @@ -640,7 +641,7 @@ func TestPackageContainer(t *testing.T) { checkCatalog := func(owner string) func(t *testing.T) { return func(t *testing.T) { - defer tests.PrepareTestEnv(t)() + defer tests.PrintCurrentTest(t)() req := NewRequest(t, "GET", fmt.Sprintf("%sv2/_catalog", setting.AppURL)) addTokenAuthHeader(req, userToken) diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go index 875b9ed96ee8..fded1d200310 100644 --- a/tests/integration/api_packages_generic_test.go +++ b/tests/integration/api_packages_generic_test.go @@ -21,6 +21,8 @@ import ( func TestPackageGeneric(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) packageName := "te-st_pac.kage" diff --git a/tests/integration/api_packages_helm_test.go b/tests/integration/api_packages_helm_test.go index 4a7d56343183..921dce99af8a 100644 --- a/tests/integration/api_packages_helm_test.go +++ b/tests/integration/api_packages_helm_test.go @@ -26,6 +26,8 @@ import ( func TestPackageHelm(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) packageName := "test-chart" diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index 5c0dbfc99cce..c2613b90d6ab 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -22,6 +22,8 @@ import ( func TestPackageMaven(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) groupID := "com.gitea" diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index 39d1c91e87d2..148622d4f741 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -24,6 +24,8 @@ import ( func TestPackageNpm(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) token := fmt.Sprintf("Bearer %s", getTokenForLoggedInUser(t, loginUser(t, user.Name))) diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go index a74d696f0341..2e083273276a 100644 --- a/tests/integration/api_packages_nuget_test.go +++ b/tests/integration/api_packages_nuget_test.go @@ -42,6 +42,7 @@ func decodeXML(t testing.TB, resp *httptest.ResponseRecorder, v interface{}) { func TestPackageNuGet(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) type FeedEntryProperties struct { Version string `xml:"Version"` diff --git a/tests/integration/api_packages_pub_test.go b/tests/integration/api_packages_pub_test.go index 325401fe7586..494aab3269c6 100644 --- a/tests/integration/api_packages_pub_test.go +++ b/tests/integration/api_packages_pub_test.go @@ -27,6 +27,8 @@ import ( func TestPackagePub(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) token := "Bearer " + getUserToken(t, user.Name) diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index 71197f92a8d8..5040aba446d8 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -25,6 +25,8 @@ import ( func TestPackagePyPI(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) packageName := "test-package" diff --git a/tests/integration/api_packages_rubygems_test.go b/tests/integration/api_packages_rubygems_test.go index c85ff9aaf59d..33bcbe845535 100644 --- a/tests/integration/api_packages_rubygems_test.go +++ b/tests/integration/api_packages_rubygems_test.go @@ -23,6 +23,8 @@ import ( func TestPackageRubyGems(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) packageName := "gitea" diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index 39852e212c38..597bf72f1f3c 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -18,8 +18,10 @@ import ( container_model "code.gitea.io/gitea/models/packages/container" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + packages_module "code.gitea.io/gitea/modules/packages" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" packages_service "code.gitea.io/gitea/services/packages" packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup" "code.gitea.io/gitea/tests" @@ -29,6 +31,7 @@ import ( func TestPackageAPI(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) session := loginUser(t, user.Name) @@ -152,6 +155,7 @@ func TestPackageAPI(t *testing.T) { func TestPackageAccess(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) @@ -173,6 +177,7 @@ func TestPackageAccess(t *testing.T) { func TestPackageQuota(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) limitTotalOwnerCount, limitTotalOwnerSize := setting.Packages.LimitTotalOwnerCount, setting.Packages.LimitTotalOwnerSize @@ -234,17 +239,37 @@ func TestPackageQuota(t *testing.T) { func TestPackageCleanup(t *testing.T) { defer tests.PrepareTestEnv(t)() + defer removeAllPackageData(t) + + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) duration, _ := time.ParseDuration("-1h") t.Run("Common", func(t *testing.T) { defer tests.PrintCurrentTest(t)() + // Upload and delete a generic package and upload a container blob + data, _ := util.CryptoRandomBytes(5) + url := fmt.Sprintf("/api/packages/%s/generic/cleanup-test/1.1.1/file.bin", user.Name) + req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(data)) + AddBasicAuthHeader(req, user.Name) + MakeRequest(t, req, http.StatusCreated) + + req = NewRequest(t, "DELETE", url) + AddBasicAuthHeader(req, user.Name) + MakeRequest(t, req, http.StatusNoContent) + + data, _ = util.CryptoRandomBytes(5) + url = fmt.Sprintf("/v2/%s/cleanup-test/blobs/uploads?digest=sha256:%x", user.Name, sha256.Sum256(data)) + req = NewRequestWithBody(t, "POST", url, bytes.NewReader(data)) + AddBasicAuthHeader(req, user.Name) + MakeRequest(t, req, http.StatusCreated) + pbs, err := packages_model.FindExpiredUnreferencedBlobs(db.DefaultContext, duration) assert.NoError(t, err) assert.NotEmpty(t, pbs) - _, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, 2, packages_model.TypeContainer, "test", container_model.UploadVersion) + _, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_model.UploadVersion) assert.NoError(t, err) err = packages_cleanup_service.Cleanup(db.DefaultContext, duration) @@ -254,15 +279,13 @@ func TestPackageCleanup(t *testing.T) { assert.NoError(t, err) assert.Empty(t, pbs) - _, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, 2, packages_model.TypeContainer, "test", container_model.UploadVersion) + _, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_model.UploadVersion) assert.ErrorIs(t, err, packages_model.ErrPackageNotExist) }) t.Run("CleanupRules", func(t *testing.T) { defer tests.PrintCurrentTest(t)() - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - type version struct { Version string ShouldExist bool @@ -403,3 +426,25 @@ func TestPackageCleanup(t *testing.T) { } }) } + +// This method removes all package related data (database and files) +func removeAllPackageData(t *testing.T) { + assert.NoError(t, db.DeleteAllRecords("package")) + assert.NoError(t, db.DeleteAllRecords("package_version")) + assert.NoError(t, db.DeleteAllRecords("package_file")) + assert.NoError(t, db.DeleteAllRecords("package_property")) + assert.NoError(t, db.DeleteAllRecords("package_blob_upload")) + assert.NoError(t, db.DeleteAllRecords("package_cleanup_rule")) + + duration, _ := time.ParseDuration("-10h") + + pbs, err := packages_model.FindExpiredUnreferencedBlobs(db.DefaultContext, duration) + assert.NoError(t, err) + + contentStore := packages_module.NewContentStore() + for _, pb := range pbs { + contentStore.Delete(packages_module.BlobHash256Key(pb.HashSHA256)) + } + + assert.NoError(t, db.DeleteAllRecords("package_blob")) +} From 90efea3318b11eb8f9c36f27f885b765bc6444a7 Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Tue, 21 Feb 2023 07:14:19 +0000 Subject: [PATCH 2/2] Use `xorm.Truncate`. --- go.mod | 2 +- go.sum | 4 +-- models/db/context.go | 13 ++++++++- models/db/engine.go | 1 + tests/integration/api_packages_cargo_test.go | 2 -- tests/integration/api_packages_chef_test.go | 1 - .../integration/api_packages_composer_test.go | 1 - tests/integration/api_packages_conan_test.go | 1 - tests/integration/api_packages_conda_test.go | 1 - .../api_packages_container_test.go | 1 - .../integration/api_packages_generic_test.go | 1 - tests/integration/api_packages_helm_test.go | 1 - tests/integration/api_packages_maven_test.go | 1 - tests/integration/api_packages_npm_test.go | 1 - tests/integration/api_packages_nuget_test.go | 1 - tests/integration/api_packages_pub_test.go | 1 - tests/integration/api_packages_pypi_test.go | 1 - .../integration/api_packages_rubygems_test.go | 1 - tests/integration/api_packages_test.go | 27 ------------------- tests/test_utils.go | 14 ++++++++++ 20 files changed, 30 insertions(+), 46 deletions(-) diff --git a/go.mod b/go.mod index 3dc050b99a17..b2e076ee9fae 100644 --- a/go.mod +++ b/go.mod @@ -116,7 +116,7 @@ require ( mvdan.cc/xurls/v2 v2.4.0 strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 xorm.io/builder v0.3.12 - xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830 + xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e ) require ( diff --git a/go.sum b/go.sum index 03c2cc18c66e..85657596f0c3 100644 --- a/go.sum +++ b/go.sum @@ -2074,5 +2074,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1: xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= xorm.io/builder v0.3.12 h1:ASZYX7fQmy+o8UJdhlLHSW57JDOkM8DNhcAF5d0LiJM= xorm.io/builder v0.3.12/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= -xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830 h1:ohaHCvT7ocSDkTEa2/2z0BXfINYlHm/Z7IzN7MeXQlM= -xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw= +xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e h1:d5PY6mwuQK5/7T6VKfFswaKMzLmGTHkJ/ZS7+cUIAjk= +xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw= diff --git a/models/db/context.go b/models/db/context.go index 4b3f7f0ee701..670f6272aa9a 100644 --- a/models/db/context.go +++ b/models/db/context.go @@ -209,7 +209,7 @@ func DecrByIDs(ctx context.Context, ids []int64, decrCol string, bean interface{ return err } -// DeleteBeans deletes all given beans, beans should contain delete conditions. +// DeleteBeans deletes all given beans, beans must contain delete conditions. func DeleteBeans(ctx context.Context, beans ...interface{}) (err error) { e := GetEngine(ctx) for i := range beans { @@ -220,6 +220,17 @@ func DeleteBeans(ctx context.Context, beans ...interface{}) (err error) { return nil } +// TruncateBeans deletes all given beans, beans may contain delete conditions. +func TruncateBeans(ctx context.Context, beans ...interface{}) (err error) { + e := GetEngine(ctx) + for i := range beans { + if _, err = e.Truncate(beans[i]); err != nil { + return err + } + } + return nil +} + // CountByBean counts the number of database records according non-empty fields of the bean as conditions. func CountByBean(ctx context.Context, bean interface{}) (int64, error) { return GetEngine(ctx).Count(bean) diff --git a/models/db/engine.go b/models/db/engine.go index 3d05fa8b6385..5020101d490a 100755 --- a/models/db/engine.go +++ b/models/db/engine.go @@ -38,6 +38,7 @@ type Engine interface { Count(...interface{}) (int64, error) Decr(column string, arg ...interface{}) *xorm.Session Delete(...interface{}) (int64, error) + Truncate(...interface{}) (int64, error) Exec(...interface{}) (sql.Result, error) Find(interface{}, ...interface{}) error Get(beans ...interface{}) (bool, error) diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go index 3cac8d9c03a2..0c542eaf1e85 100644 --- a/tests/integration/api_packages_cargo_test.go +++ b/tests/integration/api_packages_cargo_test.go @@ -30,8 +30,6 @@ import ( ) func TestPackageCargo(t *testing.T) { - defer removeAllPackageData(t) - onGiteaRun(t, testPackageCargo) } diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go index 3644839c3a40..14baddca9428 100644 --- a/tests/integration/api_packages_chef_test.go +++ b/tests/integration/api_packages_chef_test.go @@ -39,7 +39,6 @@ import ( func TestPackageChef(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index 7a1c7d00bd94..ac125905619b 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -25,7 +25,6 @@ import ( func TestPackageComposer(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go index 4bc32309f961..209aeecd16d1 100644 --- a/tests/integration/api_packages_conan_test.go +++ b/tests/integration/api_packages_conan_test.go @@ -205,7 +205,6 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha func TestPackageConan(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_conda_test.go b/tests/integration/api_packages_conda_test.go index 779fadfc92f4..daa7dca55fa2 100644 --- a/tests/integration/api_packages_conda_test.go +++ b/tests/integration/api_packages_conda_test.go @@ -26,7 +26,6 @@ import ( func TestPackageConda(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go index cf502b71df2d..ffcf18a8aefa 100644 --- a/tests/integration/api_packages_container_test.go +++ b/tests/integration/api_packages_container_test.go @@ -30,7 +30,6 @@ import ( func TestPackageContainer(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) session := loginUser(t, user.Name) diff --git a/tests/integration/api_packages_generic_test.go b/tests/integration/api_packages_generic_test.go index fded1d200310..765d11fd8331 100644 --- a/tests/integration/api_packages_generic_test.go +++ b/tests/integration/api_packages_generic_test.go @@ -21,7 +21,6 @@ import ( func TestPackageGeneric(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_helm_test.go b/tests/integration/api_packages_helm_test.go index 921dce99af8a..4f61452071b6 100644 --- a/tests/integration/api_packages_helm_test.go +++ b/tests/integration/api_packages_helm_test.go @@ -26,7 +26,6 @@ import ( func TestPackageHelm(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index c2613b90d6ab..81112f305a62 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -22,7 +22,6 @@ import ( func TestPackageMaven(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_npm_test.go b/tests/integration/api_packages_npm_test.go index 148622d4f741..6c4503f7e3b4 100644 --- a/tests/integration/api_packages_npm_test.go +++ b/tests/integration/api_packages_npm_test.go @@ -24,7 +24,6 @@ import ( func TestPackageNpm(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go index 2e083273276a..a74d696f0341 100644 --- a/tests/integration/api_packages_nuget_test.go +++ b/tests/integration/api_packages_nuget_test.go @@ -42,7 +42,6 @@ func decodeXML(t testing.TB, resp *httptest.ResponseRecorder, v interface{}) { func TestPackageNuGet(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) type FeedEntryProperties struct { Version string `xml:"Version"` diff --git a/tests/integration/api_packages_pub_test.go b/tests/integration/api_packages_pub_test.go index 494aab3269c6..24975ab6210a 100644 --- a/tests/integration/api_packages_pub_test.go +++ b/tests/integration/api_packages_pub_test.go @@ -27,7 +27,6 @@ import ( func TestPackagePub(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index 5040aba446d8..c7c466e73083 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -25,7 +25,6 @@ import ( func TestPackagePyPI(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_rubygems_test.go b/tests/integration/api_packages_rubygems_test.go index 33bcbe845535..2099357cbb77 100644 --- a/tests/integration/api_packages_rubygems_test.go +++ b/tests/integration/api_packages_rubygems_test.go @@ -23,7 +23,6 @@ import ( func TestPackageRubyGems(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go index 597bf72f1f3c..e7e2b53e474f 100644 --- a/tests/integration/api_packages_test.go +++ b/tests/integration/api_packages_test.go @@ -18,7 +18,6 @@ import ( container_model "code.gitea.io/gitea/models/packages/container" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" - packages_module "code.gitea.io/gitea/modules/packages" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" @@ -31,7 +30,6 @@ import ( func TestPackageAPI(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) session := loginUser(t, user.Name) @@ -155,7 +153,6 @@ func TestPackageAPI(t *testing.T) { func TestPackageAccess(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) @@ -177,7 +174,6 @@ func TestPackageAccess(t *testing.T) { func TestPackageQuota(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) limitTotalOwnerCount, limitTotalOwnerSize := setting.Packages.LimitTotalOwnerCount, setting.Packages.LimitTotalOwnerSize @@ -239,7 +235,6 @@ func TestPackageQuota(t *testing.T) { func TestPackageCleanup(t *testing.T) { defer tests.PrepareTestEnv(t)() - defer removeAllPackageData(t) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) @@ -426,25 +421,3 @@ func TestPackageCleanup(t *testing.T) { } }) } - -// This method removes all package related data (database and files) -func removeAllPackageData(t *testing.T) { - assert.NoError(t, db.DeleteAllRecords("package")) - assert.NoError(t, db.DeleteAllRecords("package_version")) - assert.NoError(t, db.DeleteAllRecords("package_file")) - assert.NoError(t, db.DeleteAllRecords("package_property")) - assert.NoError(t, db.DeleteAllRecords("package_blob_upload")) - assert.NoError(t, db.DeleteAllRecords("package_cleanup_rule")) - - duration, _ := time.ParseDuration("-10h") - - pbs, err := packages_model.FindExpiredUnreferencedBlobs(db.DefaultContext, duration) - assert.NoError(t, err) - - contentStore := packages_module.NewContentStore() - for _, pb := range pbs { - contentStore.Delete(packages_module.BlobHash256Key(pb.HashSHA256)) - } - - assert.NoError(t, db.DeleteAllRecords("package_blob")) -} diff --git a/tests/test_utils.go b/tests/test_utils.go index 721edc86f80c..9bfa879af1e8 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -13,6 +13,8 @@ import ( "runtime" "testing" + "code.gitea.io/gitea/models/db" + packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/git" @@ -204,6 +206,18 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() { return err })) + // clear all package data + assert.NoError(t, db.TruncateBeans(db.DefaultContext, + &packages_model.Package{}, + &packages_model.PackageVersion{}, + &packages_model.PackageFile{}, + &packages_model.PackageBlob{}, + &packages_model.PackageProperty{}, + &packages_model.PackageBlobUpload{}, + &packages_model.PackageCleanupRule{}, + )) + assert.NoError(t, storage.Clean(storage.Packages)) + return deferFn }