Skip to content

Commit 8d85006

Browse files
committed
Fix test
1 parent b61f417 commit 8d85006

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

services/repository/adopt_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ func TestAdoptRepository(t *testing.T) {
115115
assert.Error(t, err)
116116
assert.Nil(t, adoptedRepo)
117117

118-
unittest.AssertNotExistsBean(t, &repo_model.Repository{OwnerName: "user2", Name: "test-adopt"})
118+
unittest.AssertNotExistsBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: "test-adopt"})
119119

120-
exist, err := util.IsExist(repo_model.RepoPath("user2", "test-adopt"))
120+
exist, err := util.IsExist(repo_model.RepoPath(user2.Name, "test-adopt"))
121121
assert.NoError(t, err)
122122
assert.True(t, exist) // the repository should be still in the disk
123123
}

services/repository/create.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,9 @@ func createRepositoryInDB(ctx context.Context, doer, u *user_model.User, repo *r
456456

457457
func cleanupRepository(doer *user_model.User, repoID int64) {
458458
if errDelete := DeleteRepositoryDirectly(db.DefaultContext, doer, repoID); errDelete != nil {
459-
log.Error("Rollback deleteRepository: %v", errDelete)
459+
log.Error("cleanupRepository failed: %v", errDelete)
460460
// add system notice
461-
if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when create repository: %v", errDelete); err != nil {
461+
if err := system_model.CreateRepositoryNotice("DeleteRepositoryDirectly failed when cleanup repository: %v", errDelete); err != nil {
462462
log.Error("CreateRepositoryNotice: %v", err)
463463
}
464464
}

services/repository/fork_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ func TestForkRepositoryCleanup(t *testing.T) {
8383
assert.Error(t, err)
8484

8585
// assert the cleanup is successful
86-
unittest.AssertNotExistsBean(t, &repo_model.Repository{OwnerName: "test", Name: "test"})
86+
unittest.AssertNotExistsBean(t, &repo_model.Repository{OwnerName: user2.Name, Name: "test"})
8787

88-
exist, err = util.IsExist(repo_model.RepoPath("test", "test"))
88+
exist, err = util.IsExist(repo_model.RepoPath(user2.Name, "test"))
8989
assert.NoError(t, err)
9090
assert.False(t, exist)
9191
}

0 commit comments

Comments
 (0)