Skip to content

Commit 9eaa2e4

Browse files
committed
Use individual repositories.
1 parent 1bcbff8 commit 9eaa2e4

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

integrations/api_repo_lfs_test.go

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,31 @@ func TestAPILFSMediaType(t *testing.T) {
5454
MakeRequest(t, req, http.StatusUnsupportedMediaType)
5555
}
5656

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+
5767
func TestAPILFSBatch(t *testing.T) {
5868
defer prepareTestEnv(t)()
5969

6070
setting.LFS.StartServer = true
6171

62-
repo, err := models.GetRepositoryByOwnerAndName("user2", "repo1")
63-
assert.NoError(t, err)
72+
repo := createLFSTestRepository(t, "batch")
73+
6474
content := []byte("dummy1")
6575
oid := storeObjectInRepo(t, repo.ID, &content)
6676
defer repo.RemoveLFSMetaObjectByOid(oid)
6777

6878
session := loginUser(t, "user2")
6979

7080
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)
7282
req.Header.Set("Accept", lfs.MediaType)
7383
req.Header.Set("Content-Type", lfs.MediaType)
7484
return req
@@ -312,16 +322,16 @@ func TestAPILFSUpload(t *testing.T) {
312322

313323
setting.LFS.StartServer = true
314324

315-
repo, err := models.GetRepositoryByOwnerAndName("user2", "repo1")
316-
assert.NoError(t, err)
325+
repo := createLFSTestRepository(t, "upload")
326+
317327
content := []byte("dummy3")
318328
oid := storeObjectInRepo(t, repo.ID, &content)
319329
defer repo.RemoveLFSMetaObjectByOid(oid)
320330

321331
session := loginUser(t, "user2")
322332

323333
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))
325335
return req
326336
}
327337

@@ -407,16 +417,16 @@ func TestAPILFSVerify(t *testing.T) {
407417

408418
setting.LFS.StartServer = true
409419

410-
repo, err := models.GetRepositoryByOwnerAndName("user2", "repo1")
411-
assert.NoError(t, err)
420+
repo := createLFSTestRepository(t, "verify")
421+
412422
content := []byte("dummy3")
413423
oid := storeObjectInRepo(t, repo.ID, &content)
414424
defer repo.RemoveLFSMetaObjectByOid(oid)
415425

416426
session := loginUser(t, "user2")
417427

418428
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)
420430
req.Header.Set("Accept", lfs.MediaType)
421431
req.Header.Set("Content-Type", lfs.MediaType)
422432
return req

0 commit comments

Comments
 (0)