Skip to content

Commit

Permalink
Fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
N-o-Z committed Oct 30, 2024
1 parent 04b6e7e commit 68cc6c4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/api/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5911,7 +5911,7 @@ func TestController_MergePullRequest(t *testing.T) {
body := apigen.CreatePullRequestJSONRequestBody{
Description: swag.String("My description"),
DestinationBranch: "main",
SourceBranch: "branch_d",
SourceBranch: "branch_e",
Title: "My title",
}
branchResp, err := clt.CreateBranchWithResponse(ctx, repo, apigen.CreateBranchJSONRequestBody{
Expand All @@ -5921,12 +5921,12 @@ func TestController_MergePullRequest(t *testing.T) {
require.NoError(t, err)
require.Equal(t, http.StatusCreated, branchResp.StatusCode())

err = deps.catalog.CreateEntry(ctx, repo, body.SourceBranch, catalog.DBEntry{Path: "foo/bar1", PhysicalAddress: "bar1addr", CreationDate: time.Now(), Size: 1, Checksum: "cksum1"})
err = deps.catalog.CreateEntry(ctx, repo, body.SourceBranch, catalog.DBEntry{Path: "foo/bar2", PhysicalAddress: "bar2addr", CreationDate: time.Now(), Size: 1, Checksum: "cksum1"})
require.NoError(t, err)
_, err = deps.catalog.Commit(ctx, repo, body.SourceBranch, "some message", DefaultUserID, nil, nil, nil, false)
require.NoError(t, err)

err = deps.catalog.CreateEntry(ctx, repo, body.DestinationBranch, catalog.DBEntry{Path: "foo/bar1", PhysicalAddress: "bar1addr2", CreationDate: time.Now(), Size: 2, Checksum: "cksum2"})
err = deps.catalog.CreateEntry(ctx, repo, body.DestinationBranch, catalog.DBEntry{Path: "foo/bar2", PhysicalAddress: "bar2addr2", CreationDate: time.Now(), Size: 2, Checksum: "cksum2"})
require.NoError(t, err)
_, err = deps.catalog.Commit(ctx, repo, body.DestinationBranch, "some message", DefaultUserID, nil, nil, nil, false)
require.NoError(t, err)
Expand Down

0 comments on commit 68cc6c4

Please sign in to comment.