@@ -54,21 +54,31 @@ func TestAPILFSMediaType(t *testing.T) {
54
54
MakeRequest (t , req , http .StatusUnsupportedMediaType )
55
55
}
56
56
57
+ func createLFSTestRepository (t * testing.T , name string ) * models.Repository {
58
+ ctx := NewAPITestContext (t , "user2" , "lfs-" + name + "-repo" )
59
+ t .Run ("CreateRepo" , doAPICreateRepository (ctx , false ))
60
+
61
+ repo , err := models .GetRepositoryByOwnerAndName ("user2" , "lfs-" + name + "-repo" )
62
+ assert .NoError (t , err )
63
+
64
+ return repo
65
+ }
66
+
57
67
func TestAPILFSBatch (t * testing.T ) {
58
68
defer prepareTestEnv (t )()
59
69
60
70
setting .LFS .StartServer = true
61
71
62
- repo , err := models . GetRepositoryByOwnerAndName ( "user2" , "repo1 " )
63
- assert . NoError ( t , err )
72
+ repo := createLFSTestRepository ( t , "batch " )
73
+
64
74
content := []byte ("dummy1" )
65
75
oid := storeObjectInRepo (t , repo .ID , & content )
66
76
defer repo .RemoveLFSMetaObjectByOid (oid )
67
77
68
78
session := loginUser (t , "user2" )
69
79
70
80
newRequest := func (t testing.TB , br * lfs.BatchRequest ) * http.Request {
71
- req := NewRequestWithJSON (t , "POST" , "/user2/repo1 .git/info/lfs/objects/batch" , br )
81
+ req := NewRequestWithJSON (t , "POST" , "/user2/lfs-batch-repo .git/info/lfs/objects/batch" , br )
72
82
req .Header .Set ("Accept" , lfs .MediaType )
73
83
req .Header .Set ("Content-Type" , lfs .MediaType )
74
84
return req
@@ -312,16 +322,16 @@ func TestAPILFSUpload(t *testing.T) {
312
322
313
323
setting .LFS .StartServer = true
314
324
315
- repo , err := models . GetRepositoryByOwnerAndName ( "user2" , "repo1 " )
316
- assert . NoError ( t , err )
325
+ repo := createLFSTestRepository ( t , "upload " )
326
+
317
327
content := []byte ("dummy3" )
318
328
oid := storeObjectInRepo (t , repo .ID , & content )
319
329
defer repo .RemoveLFSMetaObjectByOid (oid )
320
330
321
331
session := loginUser (t , "user2" )
322
332
323
333
newRequest := func (t testing.TB , p lfs.Pointer , content string ) * http.Request {
324
- req := NewRequestWithBody (t , "PUT" , path .Join ("/user2/repo1 .git/info/lfs/objects/" , p .Oid , strconv .FormatInt (p .Size , 10 )), strings .NewReader (content ))
334
+ req := NewRequestWithBody (t , "PUT" , path .Join ("/user2/lfs-upload-repo .git/info/lfs/objects/" , p .Oid , strconv .FormatInt (p .Size , 10 )), strings .NewReader (content ))
325
335
return req
326
336
}
327
337
@@ -407,16 +417,16 @@ func TestAPILFSVerify(t *testing.T) {
407
417
408
418
setting .LFS .StartServer = true
409
419
410
- repo , err := models . GetRepositoryByOwnerAndName ( "user2" , "repo1 " )
411
- assert . NoError ( t , err )
420
+ repo := createLFSTestRepository ( t , "verify " )
421
+
412
422
content := []byte ("dummy3" )
413
423
oid := storeObjectInRepo (t , repo .ID , & content )
414
424
defer repo .RemoveLFSMetaObjectByOid (oid )
415
425
416
426
session := loginUser (t , "user2" )
417
427
418
428
newRequest := func (t testing.TB , p * lfs.Pointer ) * http.Request {
419
- req := NewRequestWithJSON (t , "POST" , "/user2/repo1 .git/info/lfs/verify" , p )
429
+ req := NewRequestWithJSON (t , "POST" , "/user2/lfs-verify-repo .git/info/lfs/verify" , p )
420
430
req .Header .Set ("Accept" , lfs .MediaType )
421
431
req .Header .Set ("Content-Type" , lfs .MediaType )
422
432
return req
0 commit comments