Skip to content

Commit 0ae1ed7

Browse files
KN4CK3Rlunnyzeripath
authored
Remove all package data after tests (#22984)
Fixes #21020 --------- Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: zeripath <[email protected]>
1 parent 3adfc0f commit 0ae1ed7

16 files changed

+62
-9
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ require (
117117
mvdan.cc/xurls/v2 v2.4.0
118118
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
119119
xorm.io/builder v0.3.12
120-
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830
120+
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e
121121
)
122122

123123
require (

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,5 +2075,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:
20752075
xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
20762076
xorm.io/builder v0.3.12 h1:ASZYX7fQmy+o8UJdhlLHSW57JDOkM8DNhcAF5d0LiJM=
20772077
xorm.io/builder v0.3.12/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
2078-
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830 h1:ohaHCvT7ocSDkTEa2/2z0BXfINYlHm/Z7IzN7MeXQlM=
2079-
xorm.io/xorm v1.3.3-0.20221209153726-f1bfc5ce9830/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=
2078+
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e h1:d5PY6mwuQK5/7T6VKfFswaKMzLmGTHkJ/ZS7+cUIAjk=
2079+
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=

‎models/db/context.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func DecrByIDs(ctx context.Context, ids []int64, decrCol string, bean interface{
209209
return err
210210
}
211211

212-
// DeleteBeans deletes all given beans, beans should contain delete conditions.
212+
// DeleteBeans deletes all given beans, beans must contain delete conditions.
213213
func DeleteBeans(ctx context.Context, beans ...interface{}) (err error) {
214214
e := GetEngine(ctx)
215215
for i := range beans {
@@ -220,6 +220,17 @@ func DeleteBeans(ctx context.Context, beans ...interface{}) (err error) {
220220
return nil
221221
}
222222

223+
// TruncateBeans deletes all given beans, beans may contain delete conditions.
224+
func TruncateBeans(ctx context.Context, beans ...interface{}) (err error) {
225+
e := GetEngine(ctx)
226+
for i := range beans {
227+
if _, err = e.Truncate(beans[i]); err != nil {
228+
return err
229+
}
230+
}
231+
return nil
232+
}
233+
223234
// CountByBean counts the number of database records according non-empty fields of the bean as conditions.
224235
func CountByBean(ctx context.Context, bean interface{}) (int64, error) {
225236
return GetEngine(ctx).Count(bean)

‎models/db/engine.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ type Engine interface {
3838
Count(...interface{}) (int64, error)
3939
Decr(column string, arg ...interface{}) *xorm.Session
4040
Delete(...interface{}) (int64, error)
41+
Truncate(...interface{}) (int64, error)
4142
Exec(...interface{}) (sql.Result, error)
4243
Find(interface{}, ...interface{}) error
4344
Get(beans ...interface{}) (bool, error)

‎tests/integration/api_packages_composer_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
func TestPackageComposer(t *testing.T) {
2727
defer tests.PrepareTestEnv(t)()
28+
2829
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2930

3031
vendorName := "gitea"

‎tests/integration/api_packages_conan_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ func uploadConanPackageV2(t *testing.T, baseURL, token, name, version, user, cha
205205

206206
func TestPackageConan(t *testing.T) {
207207
defer tests.PrepareTestEnv(t)()
208+
208209
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
209210

210211
name := "ConanPackage"

‎tests/integration/api_packages_container_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ func TestPackageContainer(t *testing.T) {
640640

641641
checkCatalog := func(owner string) func(t *testing.T) {
642642
return func(t *testing.T) {
643-
defer tests.PrepareTestEnv(t)()
643+
defer tests.PrintCurrentTest(t)()
644644

645645
req := NewRequest(t, "GET", fmt.Sprintf("%sv2/_catalog", setting.AppURL))
646646
addTokenAuthHeader(req, userToken)

‎tests/integration/api_packages_generic_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
func TestPackageGeneric(t *testing.T) {
2323
defer tests.PrepareTestEnv(t)()
24+
2425
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2526

2627
packageName := "te-st_pac.kage"

‎tests/integration/api_packages_helm_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
func TestPackageHelm(t *testing.T) {
2828
defer tests.PrepareTestEnv(t)()
29+
2930
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
3031

3132
packageName := "test-chart"

‎tests/integration/api_packages_maven_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
func TestPackageMaven(t *testing.T) {
2424
defer tests.PrepareTestEnv(t)()
25+
2526
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2627

2728
groupID := "com.gitea"

‎tests/integration/api_packages_npm_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
func TestPackageNpm(t *testing.T) {
2626
defer tests.PrepareTestEnv(t)()
27+
2728
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2829

2930
token := fmt.Sprintf("Bearer %s", getTokenForLoggedInUser(t, loginUser(t, user.Name)))

‎tests/integration/api_packages_pub_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727

2828
func TestPackagePub(t *testing.T) {
2929
defer tests.PrepareTestEnv(t)()
30+
3031
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
3132

3233
token := "Bearer " + getUserToken(t, user.Name)

‎tests/integration/api_packages_pypi_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
func TestPackagePyPI(t *testing.T) {
2727
defer tests.PrepareTestEnv(t)()
28+
2829
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2930

3031
packageName := "test-package"

‎tests/integration/api_packages_rubygems_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323

2424
func TestPackageRubyGems(t *testing.T) {
2525
defer tests.PrepareTestEnv(t)()
26+
2627
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
2728

2829
packageName := "gitea"

‎tests/integration/api_packages_test.go

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
user_model "code.gitea.io/gitea/models/user"
2020
"code.gitea.io/gitea/modules/setting"
2121
api "code.gitea.io/gitea/modules/structs"
22+
"code.gitea.io/gitea/modules/util"
2223
packages_service "code.gitea.io/gitea/services/packages"
2324
packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup"
2425
"code.gitea.io/gitea/tests"
@@ -235,16 +236,35 @@ func TestPackageQuota(t *testing.T) {
235236
func TestPackageCleanup(t *testing.T) {
236237
defer tests.PrepareTestEnv(t)()
237238

239+
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
240+
238241
duration, _ := time.ParseDuration("-1h")
239242

240243
t.Run("Common", func(t *testing.T) {
241244
defer tests.PrintCurrentTest(t)()
242245

246+
// Upload and delete a generic package and upload a container blob
247+
data, _ := util.CryptoRandomBytes(5)
248+
url := fmt.Sprintf("/api/packages/%s/generic/cleanup-test/1.1.1/file.bin", user.Name)
249+
req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(data))
250+
AddBasicAuthHeader(req, user.Name)
251+
MakeRequest(t, req, http.StatusCreated)
252+
253+
req = NewRequest(t, "DELETE", url)
254+
AddBasicAuthHeader(req, user.Name)
255+
MakeRequest(t, req, http.StatusNoContent)
256+
257+
data, _ = util.CryptoRandomBytes(5)
258+
url = fmt.Sprintf("/v2/%s/cleanup-test/blobs/uploads?digest=sha256:%x", user.Name, sha256.Sum256(data))
259+
req = NewRequestWithBody(t, "POST", url, bytes.NewReader(data))
260+
AddBasicAuthHeader(req, user.Name)
261+
MakeRequest(t, req, http.StatusCreated)
262+
243263
pbs, err := packages_model.FindExpiredUnreferencedBlobs(db.DefaultContext, duration)
244264
assert.NoError(t, err)
245265
assert.NotEmpty(t, pbs)
246266

247-
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, 2, packages_model.TypeContainer, "test", container_model.UploadVersion)
267+
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_model.UploadVersion)
248268
assert.NoError(t, err)
249269

250270
err = packages_cleanup_service.Cleanup(db.DefaultContext, duration)
@@ -254,15 +274,13 @@ func TestPackageCleanup(t *testing.T) {
254274
assert.NoError(t, err)
255275
assert.Empty(t, pbs)
256276

257-
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, 2, packages_model.TypeContainer, "test", container_model.UploadVersion)
277+
_, err = packages_model.GetInternalVersionByNameAndVersion(db.DefaultContext, user.ID, packages_model.TypeContainer, "cleanup-test", container_model.UploadVersion)
258278
assert.ErrorIs(t, err, packages_model.ErrPackageNotExist)
259279
})
260280

261281
t.Run("CleanupRules", func(t *testing.T) {
262282
defer tests.PrintCurrentTest(t)()
263283

264-
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
265-
266284
type version struct {
267285
Version string
268286
ShouldExist bool

‎tests/test_utils.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import (
1313
"runtime"
1414
"testing"
1515

16+
"code.gitea.io/gitea/models/db"
17+
packages_model "code.gitea.io/gitea/models/packages"
1618
"code.gitea.io/gitea/models/unittest"
1719
"code.gitea.io/gitea/modules/base"
1820
"code.gitea.io/gitea/modules/git"
@@ -204,6 +206,18 @@ func PrepareTestEnv(t testing.TB, skip ...int) func() {
204206
return err
205207
}))
206208

209+
// clear all package data
210+
assert.NoError(t, db.TruncateBeans(db.DefaultContext,
211+
&packages_model.Package{},
212+
&packages_model.PackageVersion{},
213+
&packages_model.PackageFile{},
214+
&packages_model.PackageBlob{},
215+
&packages_model.PackageProperty{},
216+
&packages_model.PackageBlobUpload{},
217+
&packages_model.PackageCleanupRule{},
218+
))
219+
assert.NoError(t, storage.Clean(storage.Packages))
220+
207221
return deferFn
208222
}
209223

0 commit comments

Comments
 (0)