mirror of
https://github.com/go-gitea/gitea
synced 2024-12-23 00:54:28 +00:00
Remove all package data after tests (#22984)
Fixes #21020 --------- Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
parent
3adfc0f02d
commit
0ae1ed749d
2
go.mod
2
go.mod
@ -117,7 +117,7 @@ require (
|
|||||||
mvdan.cc/xurls/v2 v2.4.0
|
mvdan.cc/xurls/v2 v2.4.0
|
||||||
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
|
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
|
||||||
xorm.io/builder v0.3.12
|
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 (
|
require (
|
||||||
|
4
go.sum
4
go.sum
@ -2075,5 +2075,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.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
|
||||||
xorm.io/builder v0.3.12 h1:ASZYX7fQmy+o8UJdhlLHSW57JDOkM8DNhcAF5d0LiJM=
|
xorm.io/builder v0.3.12 h1:ASZYX7fQmy+o8UJdhlLHSW57JDOkM8DNhcAF5d0LiJM=
|
||||||
xorm.io/builder v0.3.12/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
|
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.20230219231735-056cecc97e9e h1:d5PY6mwuQK5/7T6VKfFswaKMzLmGTHkJ/ZS7+cUIAjk=
|
||||||
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=
|
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=
|
||||||
|
@ -209,7 +209,7 @@ func DecrByIDs(ctx context.Context, ids []int64, decrCol string, bean interface{
|
|||||||
return err
|
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) {
|
func DeleteBeans(ctx context.Context, beans ...interface{}) (err error) {
|
||||||
e := GetEngine(ctx)
|
e := GetEngine(ctx)
|
||||||
for i := range beans {
|
for i := range beans {
|
||||||
@ -220,6 +220,17 @@ func DeleteBeans(ctx context.Context, beans ...interface{}) (err error) {
|
|||||||
return nil
|
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.
|
// 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) {
|
func CountByBean(ctx context.Context, bean interface{}) (int64, error) {
|
||||||
return GetEngine(ctx).Count(bean)
|
return GetEngine(ctx).Count(bean)
|
||||||
|
@ -38,6 +38,7 @@ type Engine interface {
|
|||||||
Count(...interface{}) (int64, error)
|
Count(...interface{}) (int64, error)
|
||||||
Decr(column string, arg ...interface{}) *xorm.Session
|
Decr(column string, arg ...interface{}) *xorm.Session
|
||||||
Delete(...interface{}) (int64, error)
|
Delete(...interface{}) (int64, error)
|
||||||
|
Truncate(...interface{}) (int64, error)
|
||||||
Exec(...interface{}) (sql.Result, error)
|
Exec(...interface{}) (sql.Result, error)
|
||||||
Find(interface{}, ...interface{}) error
|
Find(interface{}, ...interface{}) error
|
||||||
Get(beans ...interface{}) (bool, error)
|
Get(beans ...interface{}) (bool, error)
|
||||||
|
@ -25,6 +25,7 @@ import (
|
|||||||
|
|
||||||
func TestPackageComposer(t *testing.T) {
|
func TestPackageComposer(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
vendorName := "gitea"
|
vendorName := "gitea"
|
||||||
|
@ -205,6 +205,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
|
|||||||
|
|
||||||
func TestPackageConan(t *testing.T) {
|
func TestPackageConan(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
name := "ConanPackage"
|
name := "ConanPackage"
|
||||||
|
@ -640,7 +640,7 @@ func TestPackageContainer(t *testing.T) {
|
|||||||
|
|
||||||
checkCatalog := func(owner string) func(t *testing.T) {
|
checkCatalog := func(owner string) func(t *testing.T) {
|
||||||
return 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))
|
req := NewRequest(t, "GET", fmt.Sprintf("%sv2/_catalog", setting.AppURL))
|
||||||
addTokenAuthHeader(req, userToken)
|
addTokenAuthHeader(req, userToken)
|
||||||
|
@ -21,6 +21,7 @@ import (
|
|||||||
|
|
||||||
func TestPackageGeneric(t *testing.T) {
|
func TestPackageGeneric(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
packageName := "te-st_pac.kage"
|
packageName := "te-st_pac.kage"
|
||||||
|
@ -26,6 +26,7 @@ import (
|
|||||||
|
|
||||||
func TestPackageHelm(t *testing.T) {
|
func TestPackageHelm(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
packageName := "test-chart"
|
packageName := "test-chart"
|
||||||
|
@ -22,6 +22,7 @@ import (
|
|||||||
|
|
||||||
func TestPackageMaven(t *testing.T) {
|
func TestPackageMaven(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
groupID := "com.gitea"
|
groupID := "com.gitea"
|
||||||
|
@ -24,6 +24,7 @@ import (
|
|||||||
|
|
||||||
func TestPackageNpm(t *testing.T) {
|
func TestPackageNpm(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
token := fmt.Sprintf("Bearer %s", getTokenForLoggedInUser(t, loginUser(t, user.Name)))
|
token := fmt.Sprintf("Bearer %s", getTokenForLoggedInUser(t, loginUser(t, user.Name)))
|
||||||
|
@ -27,6 +27,7 @@ import (
|
|||||||
|
|
||||||
func TestPackagePub(t *testing.T) {
|
func TestPackagePub(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
token := "Bearer " + getUserToken(t, user.Name)
|
token := "Bearer " + getUserToken(t, user.Name)
|
||||||
|
@ -25,6 +25,7 @@ import (
|
|||||||
|
|
||||||
func TestPackagePyPI(t *testing.T) {
|
func TestPackagePyPI(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
packageName := "test-package"
|
packageName := "test-package"
|
||||||
|
@ -23,6 +23,7 @@ import (
|
|||||||
|
|
||||||
func TestPackageRubyGems(t *testing.T) {
|
func TestPackageRubyGems(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
packageName := "gitea"
|
packageName := "gitea"
|
||||||
|
@ -19,6 +19,7 @@ import (
|
|||||||
user_model "code.gitea.io/gitea/models/user"
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
api "code.gitea.io/gitea/modules/structs"
|
api "code.gitea.io/gitea/modules/structs"
|
||||||
|
"code.gitea.io/gitea/modules/util"
|
||||||
packages_service "code.gitea.io/gitea/services/packages"
|
packages_service "code.gitea.io/gitea/services/packages"
|
||||||
packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup"
|
packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup"
|
||||||
"code.gitea.io/gitea/tests"
|
"code.gitea.io/gitea/tests"
|
||||||
@ -235,16 +236,35 @@ func TestPackageQuota(t *testing.T) {
|
|||||||
func TestPackageCleanup(t *testing.T) {
|
func TestPackageCleanup(t *testing.T) {
|
||||||
defer tests.PrepareTestEnv(t)()
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
duration, _ := time.ParseDuration("-1h")
|
duration, _ := time.ParseDuration("-1h")
|
||||||
|
|
||||||
t.Run("Common", func(t *testing.T) {
|
t.Run("Common", func(t *testing.T) {
|
||||||
defer tests.PrintCurrentTest(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)
|
pbs, err := packages_model.FindExpiredUnreferencedBlobs(db.DefaultContext, duration)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.NotEmpty(t, pbs)
|
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)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
err = packages_cleanup_service.Cleanup(db.DefaultContext, duration)
|
err = packages_cleanup_service.Cleanup(db.DefaultContext, duration)
|
||||||
@ -254,15 +274,13 @@ func TestPackageCleanup(t *testing.T) {
|
|||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Empty(t, pbs)
|
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)
|
assert.ErrorIs(t, err, packages_model.ErrPackageNotExist)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("CleanupRules", func(t *testing.T) {
|
t.Run("CleanupRules", func(t *testing.T) {
|
||||||
defer tests.PrintCurrentTest(t)()
|
defer tests.PrintCurrentTest(t)()
|
||||||
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
||||||
|
|
||||||
type version struct {
|
type version struct {
|
||||||
Version string
|
Version string
|
||||||
ShouldExist bool
|
ShouldExist bool
|
||||||
|
@ -13,6 +13,8 @@ import (
|
|||||||
"runtime"
|
"runtime"
|
||||||
"testing"
|
"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/models/unittest"
|
||||||
"code.gitea.io/gitea/modules/base"
|
"code.gitea.io/gitea/modules/base"
|
||||||
"code.gitea.io/gitea/modules/git"
|
"code.gitea.io/gitea/modules/git"
|
||||||
@ -204,6 +206,18 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() {
|
|||||||
return err
|
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
|
return deferFn
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user