diff options
author | James Liu <jliu@gitlab.com> | 2024-01-11 09:07:32 +0300 |
---|---|---|
committer | GitLab <noreply@gitlab.com> | 2024-01-11 09:07:32 +0300 |
commit | e723389f79dea270432590bbb1cb68a5f8df5b87 (patch) | |
tree | 015626fa4f9d26e2ae04ad04f32cd265fe47a5d6 /internal/gitaly/storage/storagemgr/transaction_manager_test.go | |
parent | 686929072dce472eb062521cf63f0e1bda4d310f (diff) | |
parent | 779eac1cc50936a84d34bab08d729193fbb0b7ea (diff) |
Merge branch 'qmnguyen0711/refactor-keeparound-log-entries' into 'master'
Unify transaction manager's references assertion
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6592
Merged-by: James Liu <jliu@gitlab.com>
Approved-by: James Liu <jliu@gitlab.com>
Reviewed-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Reviewed-by: James Liu <jliu@gitlab.com>
Co-authored-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Diffstat (limited to 'internal/gitaly/storage/storagemgr/transaction_manager_test.go')
-rw-r--r-- | internal/gitaly/storage/storagemgr/transaction_manager_test.go | 72 |
1 files changed, 49 insertions, 23 deletions
diff --git a/internal/gitaly/storage/storagemgr/transaction_manager_test.go b/internal/gitaly/storage/storagemgr/transaction_manager_test.go index 3383e289c..2e5e2b8b8 100644 --- a/internal/gitaly/storage/storagemgr/transaction_manager_test.go +++ b/internal/gitaly/storage/storagemgr/transaction_manager_test.go @@ -358,7 +358,11 @@ func generateCommonTests(t *testing.T, ctx context.Context, setup testTransactio Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/main", - References: []git.Reference{{Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + }, + }, }, }, }, @@ -502,8 +506,10 @@ func generateCommonTests(t *testing.T, ctx context.Context, setup testTransactio Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/main", - References: []git.Reference{ - {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + }, }, Objects: []git.ObjectID{ setup.ObjectHash.EmptyTreeOID, @@ -573,8 +579,10 @@ func generateCommonTests(t *testing.T, ctx context.Context, setup testTransactio Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/main", - References: []git.Reference{ - {Name: "refs/heads/main", Target: setup.Commits.Third.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.Third.OID, + }, }, CustomHooks: testhelper.DirectoryState{ "/": {Mode: fs.ModeDir | perm.PrivateDir}, @@ -635,8 +643,10 @@ func generateCommonTests(t *testing.T, ctx context.Context, setup testTransactio Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/main", - References: []git.Reference{ - {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + }, }, Objects: []git.ObjectID{ setup.ObjectHash.EmptyTreeOID, @@ -747,8 +757,10 @@ func generateCommonTests(t *testing.T, ctx context.Context, setup testTransactio Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/main", - References: []git.Reference{ - {Name: "refs/heads/main", Target: setup.Commits.Third.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.Third.OID, + }, }, Objects: []git.ObjectID{ setup.ObjectHash.EmptyTreeOID, @@ -810,8 +822,10 @@ func generateCommonTests(t *testing.T, ctx context.Context, setup testTransactio Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/main", - References: []git.Reference{ - {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + }, }, Objects: []git.ObjectID{ setup.ObjectHash.EmptyTreeOID, @@ -899,8 +913,10 @@ func generateCommonTests(t *testing.T, ctx context.Context, setup testTransactio Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/main", - References: []git.Reference{ - {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + }, }, Objects: []git.ObjectID{ setup.ObjectHash.EmptyTreeOID, @@ -1444,8 +1460,10 @@ func generateCommonTests(t *testing.T, ctx context.Context, setup testTransactio Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/new-head", - References: []git.Reference{ - {Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + }, }, Objects: []git.ObjectID{ setup.ObjectHash.EmptyTreeOID, @@ -1491,7 +1509,11 @@ func generateCommonTests(t *testing.T, ctx context.Context, setup testTransactio Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/new-head", - References: []git.Reference{{Name: "refs/heads/main", Target: setup.Commits.First.OID.String()}}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + }, + }, Objects: []git.ObjectID{ setup.ObjectHash.EmptyTreeOID, setup.Commits.First.OID, @@ -1616,9 +1638,11 @@ func generateCommittedEntriesTests(t *testing.T, setup testTransactionSetup) []t Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/main", - References: []git.Reference{ - {Name: "refs/heads/branch-1", Target: string(setup.Commits.First.OID)}, - {Name: "refs/heads/main", Target: string(setup.Commits.First.OID)}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + "refs/heads/branch-1": setup.Commits.First.OID, + }, }, }, }, @@ -1725,10 +1749,12 @@ func generateCommittedEntriesTests(t *testing.T, setup testTransactionSetup) []t Repositories: RepositoryStates{ setup.RelativePath: { DefaultBranch: "refs/heads/main", - References: []git.Reference{ - {Name: "refs/heads/branch-1", Target: string(setup.Commits.First.OID)}, - {Name: "refs/heads/branch-2", Target: string(setup.Commits.First.OID)}, - {Name: "refs/heads/main", Target: string(setup.Commits.First.OID)}, + References: &ReferencesState{ + LooseReferences: map[git.ReferenceName]git.ObjectID{ + "refs/heads/main": setup.Commits.First.OID, + "refs/heads/branch-1": setup.Commits.First.OID, + "refs/heads/branch-2": setup.Commits.First.OID, + }, }, }, }, |