Skip to content

Commit 122001c

Browse files
wxiaoguangwxiaoguang
committed
make tests pass
1 parent 83b74ef commit 122001c

File tree

1 file changed

+60
-36
lines changed

1 file changed

+60
-36
lines changed

‎tests/integration/api_packages_arch_new_test.go

Lines changed: 60 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"code.gitea.io/gitea/models/unittest"
2424
user_model "code.gitea.io/gitea/models/user"
2525
arch_model "code.gitea.io/gitea/modules/packages/arch"
26+
"code.gitea.io/gitea/modules/test"
2627
"code.gitea.io/gitea/modules/util"
2728
"code.gitea.io/gitea/tests"
2829

@@ -40,6 +41,9 @@ func TestPackageArchNew(t *testing.T) {
4041
}
4142
rootURL := fmt.Sprintf("/api/packages/%s/arch", user.Name)
4243

44+
// DIFF:RepositoryKey
45+
keyURL := fmt.Sprintf("/api/packages/%s/arch/key", user.Name)
46+
4347
pkgs := map[string][]byte{
4448
// pkgname = test, arch = any
4549
"any": unpack(`
@@ -128,14 +132,16 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
128132
t.Run("RepositoryKey", func(t *testing.T) {
129133
defer tests.PrintCurrentTest(t)()
130134

131-
req := NewRequest(t, "GET", rootURL+"/repository.key")
135+
req := NewRequest(t, "GET", keyURL)
132136
resp := MakeRequest(t, req, http.StatusOK)
133137

134138
require.Equal(t, "application/pgp-keys", resp.Header().Get("Content-Type"))
135139
require.Contains(t, resp.Body.String(), "-----BEGIN PGP PUBLIC KEY BLOCK-----")
136140
})
137141

138-
for _, group := range []string{"", "arch", "arch/os", "x86_64"} {
142+
// DIFF:RepositoryName
143+
//for _, group := range []string{"arch", "arch/os"} {
144+
for _, group := range []string{"main-repo", "test-repo"} {
139145
groupURL := rootURL + util.Iif(group == "", "", "/"+group)
140146
t.Run(fmt.Sprintf("Upload[%s]", group), func(t *testing.T) {
141147
defer tests.PrintCurrentTest(t)()
@@ -149,7 +155,9 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
149155

150156
req = NewRequestWithBody(t, "PUT", groupURL, bytes.NewBuffer([]byte("any string"))).
151157
AddBasicAuth(user.Name)
152-
MakeRequest(t, req, http.StatusBadRequest)
158+
// DIFF:InvalidPackage
159+
//MakeRequest(t, req, http.StatusBadRequest)
160+
MakeRequest(t, req, http.StatusInternalServerError)
153161

154162
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeArch)
155163
require.NoError(t, err)
@@ -166,11 +174,13 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
166174
require.NoError(t, err)
167175
size := 0
168176
for _, pf := range pfs {
169-
if pf.CompositeKey == group {
177+
if strings.HasPrefix(pf.CompositeKey, group+"|") {
170178
size++
171179
}
172180
}
173-
require.Equal(t, 2, size) // zst and zst.sig
181+
// DIFF:PackageFileStore
182+
//require.Equal(t, 2, size) // zst and zst.sig
183+
require.Equal(t, 1, size) // zst
174184

175185
pb, err := packages.GetBlobByID(db.DefaultContext, pfs[0].BlobID)
176186
require.NoError(t, err)
@@ -192,28 +202,30 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
192202

193203
t.Run(fmt.Sprintf("Download[%s]", group), func(t *testing.T) {
194204
defer tests.PrintCurrentTest(t)()
195-
req := NewRequest(t, "GET", groupURL+"/x86_64/test-1.0.0-1-x86_64.pkg.tar.zst")
205+
206+
// DIFF:PackageFileNameExt
207+
req := NewRequest(t, "GET", groupURL+"/x86_64/test-1.0.0-1-x86_64.pck.tar.zst")
196208
resp := MakeRequest(t, req, http.StatusOK)
197209
require.Equal(t, pkgs["x86_64"], resp.Body.Bytes())
198210

199-
req = NewRequest(t, "GET", groupURL+"/x86_64/test-1.0.0-1-any.pkg.tar.zst")
211+
req = NewRequest(t, "GET", groupURL+"/x86_64/test-1.0.0-1-any.pck.tar.zst")
200212
resp = MakeRequest(t, req, http.StatusOK)
201213
require.Equal(t, pkgs["any"], resp.Body.Bytes())
202214

203215
// get other group
204-
req = NewRequest(t, "GET", rootURL+"/unknown/x86_64/test-1.0.0-1-aarch64.pkg.tar.zst")
216+
req = NewRequest(t, "GET", rootURL+"/unknown/x86_64/test-1.0.0-1-aarch64.pck.tar.zst")
205217
MakeRequest(t, req, http.StatusNotFound)
206218
})
207219

208220
t.Run(fmt.Sprintf("SignVerify[%s]", group), func(t *testing.T) {
209221
defer tests.PrintCurrentTest(t)()
210-
req := NewRequest(t, "GET", rootURL+"/repository.key")
222+
req := NewRequest(t, "GET", keyURL)
211223
respPub := MakeRequest(t, req, http.StatusOK)
212224

213-
req = NewRequest(t, "GET", groupURL+"/x86_64/test-1.0.0-1-any.pkg.tar.zst")
225+
req = NewRequest(t, "GET", groupURL+"/x86_64/test-1.0.0-1-any.pck.tar.zst")
214226
respPkg := MakeRequest(t, req, http.StatusOK)
215227

216-
req = NewRequest(t, "GET", groupURL+"/x86_64/test-1.0.0-1-any.pkg.tar.zst.sig")
228+
req = NewRequest(t, "GET", groupURL+"/x86_64/test-1.0.0-1-any.pck.tar.zst.sig")
217229
respSig := MakeRequest(t, req, http.StatusOK)
218230

219231
if err := gpgVerify(respPub.Body.Bytes(), respSig.Body.Bytes(), respPkg.Body.Bytes()); err != nil {
@@ -223,7 +235,7 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
223235

224236
t.Run(fmt.Sprintf("RepositoryDB[%s]", group), func(t *testing.T) {
225237
defer tests.PrintCurrentTest(t)()
226-
req := NewRequest(t, "GET", rootURL+"/repository.key")
238+
req := NewRequest(t, "GET", keyURL)
227239
respPub := MakeRequest(t, req, http.StatusOK)
228240

229241
req = NewRequest(t, "GET", groupURL+"/x86_64/base.db")
@@ -237,8 +249,14 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
237249
}
238250
files, err := listTarGzFiles(respPkg.Body.Bytes())
239251
require.NoError(t, err)
240-
require.Len(t, files, 1)
252+
253+
// DIFF:RepositoryDBFiles
254+
//require.Len(t, files, 1)
255+
require.Len(t, files, 2) // files, desc
241256
for s, d := range files {
257+
if !strings.HasSuffix(s, "/desc") {
258+
continue
259+
}
242260
name := getProperty(string(d.Data), "NAME")
243261
ver := getProperty(string(d.Data), "VERSION")
244262
require.Equal(t, name+"-"+ver+"/desc", s)
@@ -255,48 +273,51 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
255273
t.Run(fmt.Sprintf("Delete[%s]", group), func(t *testing.T) {
256274
defer tests.PrintCurrentTest(t)()
257275
// test data
258-
req := NewRequestWithBody(t, "PUT", groupURL, bytes.NewReader(pkgs["otherXZ"])).
276+
req := NewRequestWithBody(t, "PUT", groupURL, bytes.NewReader(pkgs["otherZST"])).
259277
AddBasicAuth(user.Name)
260278
MakeRequest(t, req, http.StatusCreated)
261279

280+
//DIFF:DeletePackageURL
281+
//req = NewRequestWithBody(t, "DELETE", rootURL+"/base/notfound/1.0.0-1/any", nil).
262282
req = NewRequestWithBody(t, "DELETE", rootURL+"/base/notfound/1.0.0-1/any", nil).
263283
AddBasicAuth(user.Name)
264284
MakeRequest(t, req, http.StatusNotFound)
265285

266-
req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/x86_64", nil).
286+
//req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/x86_64", nil).
287+
req = NewRequestWithBody(t, "DELETE", groupURL+"/x86_64/test-1.0.0-1-x86_64.pck.tar.zst", nil).
267288
AddBasicAuth(user.Name)
268289
MakeRequest(t, req, http.StatusNoContent)
269290

270-
req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/any", nil).
291+
//req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/any", nil).
292+
req = NewRequestWithBody(t, "DELETE", groupURL+"/any/test-1.0.0-1-any.pck.tar.zst", nil).
271293
AddBasicAuth(user.Name)
272294
MakeRequest(t, req, http.StatusNoContent)
273295

274296
req = NewRequest(t, "GET", groupURL+"/x86_64/base.db")
275297
respPkg := MakeRequest(t, req, http.StatusOK)
276298
files, err := listTarGzFiles(respPkg.Body.Bytes())
277299
require.NoError(t, err)
278-
require.Len(t, files, 1)
300+
require.Len(t, files, 2) // now, only "test2-1.0.0-1/files" and "test2-1.0.0-1/desc"
279301

280-
req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1/any", nil).
281-
AddBasicAuth(user.Name)
302+
//req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1/any", nil).
303+
req = NewRequestWithBody(t, "DELETE", groupURL+"/any/test2-1.0.0-1-any.pck.tar.zst", nil).AddBasicAuth(user.Name)
282304
MakeRequest(t, req, http.StatusNoContent)
283305

284-
req = NewRequest(t, "GET", groupURL+"/x86_64/base.db").
285-
AddBasicAuth(user.Name)
306+
req = NewRequest(t, "GET", groupURL+"/x86_64/base.db").AddBasicAuth(user.Name)
286307
MakeRequest(t, req, http.StatusNotFound)
287308

288-
req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/aarch64", nil).
289-
AddBasicAuth(user.Name)
309+
//req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/aarch64", nil).
310+
req = NewRequestWithBody(t, "DELETE", groupURL+"/aarch64/test-1.0.0-1-aarch64.pck.tar.zst", nil).AddBasicAuth(user.Name)
290311
MakeRequest(t, req, http.StatusNoContent)
291312

292-
req = NewRequest(t, "GET", groupURL+"/aarch64/base.db").
293-
AddBasicAuth(user.Name)
313+
req = NewRequest(t, "GET", groupURL+"/aarch64/base.db").AddBasicAuth(user.Name)
294314
MakeRequest(t, req, http.StatusNotFound)
295315
})
296316

317+
// DIFF:OtherPackageType
297318
for tp, key := range map[string]string{
298-
"GZ": "otherGZ",
299-
"XZ": "otherXZ",
319+
//"GZ": "otherGZ",
320+
//"XZ": "otherXZ",
300321
"ZST": "otherZST",
301322
} {
302323
t.Run(fmt.Sprintf("Upload%s[%s]", tp, group), func(t *testing.T) {
@@ -305,12 +326,12 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
305326
AddBasicAuth(user.Name)
306327
MakeRequest(t, req, http.StatusCreated)
307328

308-
req = NewRequest(t, "GET", groupURL+"/x86_64/test2-1.0.0-1-any.pkg.tar."+strings.ToLower(tp))
329+
req = NewRequest(t, "GET", groupURL+"/x86_64/test2-1.0.0-1-any.pck.tar."+strings.ToLower(tp))
309330
resp := MakeRequest(t, req, http.StatusOK)
310331
require.Equal(t, pkgs[key], resp.Body.Bytes())
311332

312-
req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1/any", nil).
313-
AddBasicAuth(user.Name)
333+
//req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1/any", nil).AddBasicAuth(user.Name)
334+
req = NewRequestWithBody(t, "DELETE", groupURL+"/any/test2-1.0.0-1-any.pck.tar."+strings.ToLower(tp), nil).AddBasicAuth(user.Name)
314335
MakeRequest(t, req, http.StatusNoContent)
315336
})
316337
}
@@ -326,21 +347,22 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
326347
wg.Add(1)
327348
go func(i string) {
328349
defer wg.Done()
329-
req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs[i])).
350+
req := NewRequestWithBody(t, "PUT", rootURL+"/concur-repo", bytes.NewReader(pkgs[i])).
330351
AddBasicAuth(user.Name)
331352
MakeRequest(t, req, http.StatusCreated)
332353
}(tag)
333354
}
334355
wg.Wait()
335356
for _, target := range targets {
336-
req := NewRequestWithBody(t, "DELETE", rootURL+"/test/1.0.0-1/"+target, nil).
337-
AddBasicAuth(user.Name)
357+
req := NewRequestWithBody(t, "DELETE", rootURL+"/concur-repo/"+target+"/test-1.0.0-1-"+target+".pck.tar.zst", nil).AddBasicAuth(user.Name)
338358
MakeRequest(t, req, http.StatusNoContent)
339359
}
340360
})
341361

342362
t.Run("List Meta.Arch[any]", func(t *testing.T) {
343363
defer tests.PrintCurrentTest(t)()
364+
// DIFF:RepositoryName
365+
defer test.MockVariableValue(&rootURL, rootURL+"/list-repo")()
344366

345367
req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs["any"])).AddBasicAuth(user.Name)
346368
MakeRequest(t, req, http.StatusCreated)
@@ -350,17 +372,19 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA
350372

351373
files, err := listTarGzFiles(respPkg.Body.Bytes())
352374
require.NoError(t, err)
353-
require.Len(t, files, 1) // only one package: "test"
375+
//require.Len(t, files, 1)
376+
require.Len(t, files, 2) // only one package: "test (files, desc)"
354377

355-
req = NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs["otherXZ"])).AddBasicAuth(user.Name)
378+
req = NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs["otherZST"])).AddBasicAuth(user.Name)
356379
MakeRequest(t, req, http.StatusCreated)
357380

358381
req = NewRequest(t, "GET", rootURL+"/x86_64/base.db")
359382
resp := MakeRequest(t, req, http.StatusOK)
360383

361384
files, err = listTarGzFiles(resp.Body.Bytes())
362385
require.NoError(t, err)
363-
require.Len(t, files, 2) // now there are 2 packages: "test" and "test2"
386+
//require.Len(t, files, 2) // now there are 2 packages: "test" and "test2"
387+
require.Len(t, files, 4) // now there are 2 packages: "test" and "test2" (files, desc)*2
364388
})
365389
}
366390

0 commit comments

Comments
 (0)