Skip to content

Commit 7c9dfe0

Browse files
rendre-greylingrendre-greyling
committed
Fix build and unit test issues
Signed-off-by: Rendre Greyling <rendre.greyling@nokia.com>
1 parent 2fdcf3d commit 7c9dfe0

8 files changed

Lines changed: 89 additions & 130 deletions

File tree

‎pkg/cache/dbcache/dbpackagerevision_test.go‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -770,13 +770,6 @@ func (t *DbTestSuite) TestDBPackageRevisionPublishWithPushDraftsToGit() {
770770

771771
testRepo.externalRepo = extRepo
772772
testRepo.pushDraftsToGit = true
773-
testRepo.gitPRCache = make(map[string]repository.PackageRevision)
774-
775-
// Create: a git draft is opened and then closed, yielding the cached git PR.
776-
initialGitDraft := mockrepo.NewMockPackageRevisionDraft(t.T())
777-
cachedGitPR := mockrepo.NewMockPackageRevision(t.T())
778-
extRepo.EXPECT().CreatePackageRevisionDraft(mock.Anything, mock.Anything).Return(initialGitDraft, nil).Once()
779-
extRepo.EXPECT().ClosePackageRevisionDraft(mock.Anything, initialGitDraft, 0).Return(cachedGitPR, nil).Once()
780773

781774
newPRDef := porchapi.PackageRevision{
782775
Spec: porchapi.PackageRevisionSpec{
@@ -792,7 +785,6 @@ func (t *DbTestSuite) TestDBPackageRevisionPublishWithPushDraftsToGit() {
792785

793786
dbPR, err := testRepo.ClosePackageRevisionDraft(ctx, prDraft, 0)
794787
t.Require().NoError(err)
795-
t.Require().Nil(dbPR.(*dbPackageRevision).gitPRDraft, "closing a draft must release the git draft handle")
796788

797789
// Propose.
798790
err = dbPR.UpdateLifecycle(ctx, porchapi.PackageRevisionLifecycleProposed)
@@ -801,30 +793,20 @@ func (t *DbTestSuite) TestDBPackageRevisionPublishWithPushDraftsToGit() {
801793
dbPR, err = testRepo.ClosePackageRevisionDraft(ctx, dbPR.(repository.PackageRevisionDraft), 0)
802794
t.Require().NoError(err)
803795

804-
// Approve. dbRepository.UpdatePackageRevision reopens the cached git PR as a draft, and
805-
// publishPR opens and closes a second one with the real revision number.
806-
staleGitDraft := mockrepo.NewMockPackageRevisionDraft(t.T())
796+
// Publish pushes to git via PushPublishedPackageRevision (no prior draft push, so a new git draft is created).
807797
publishGitDraft := mockrepo.NewMockPackageRevisionDraft(t.T())
808798
publishedGitPR := mockrepo.NewMockPackageRevision(t.T())
809799

810-
extRepo.EXPECT().UpdatePackageRevision(mock.Anything, cachedGitPR).Return(staleGitDraft, nil).Once()
811-
extRepo.EXPECT().UpdatePackageRevision(mock.Anything, cachedGitPR).Return(publishGitDraft, nil).Once()
800+
extRepo.EXPECT().CreatePackageRevisionDraft(mock.Anything, mock.Anything).Return(publishGitDraft, nil).Once()
801+
publishGitDraft.EXPECT().UpdateResources(mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
812802
publishGitDraft.EXPECT().UpdateLifecycle(mock.Anything, porchapi.PackageRevisionLifecyclePublished).Return(nil).Once()
813-
// The revision number, never 0, is what reaches git for a Published draft.
814803
extRepo.EXPECT().ClosePackageRevisionDraft(mock.Anything, publishGitDraft, 1).Return(publishedGitPR, nil).Once()
815804
publishedGitPR.EXPECT().GetLock(mock.Anything).Return(kptfilev1.Upstream{}, kptfilev1.Locator{}, nil).Once()
816805

817-
approveDraft, err := testRepo.UpdatePackageRevision(ctx, dbPR)
818-
t.Require().NoError(err)
819-
t.Require().Equal(staleGitDraft, approveDraft.(*dbPackageRevision).gitPRDraft)
820-
821-
err = approveDraft.UpdateLifecycle(ctx, porchapi.PackageRevisionLifecyclePublished)
806+
err = dbPR.UpdateLifecycle(ctx, porchapi.PackageRevisionLifecyclePublished)
822807
t.Require().NoError(err)
823-
t.Require().Nil(approveDraft.(*dbPackageRevision).gitPRDraft,
824-
"publishing must release the stale git draft handle so it is not closed with version 0")
825808

826-
// No further git calls are expected here: staleGitDraft is never closed.
827-
publishedPR, err := testRepo.ClosePackageRevisionDraft(ctx, approveDraft, 0)
809+
publishedPR, err := testRepo.ClosePackageRevisionDraft(ctx, dbPR.(repository.PackageRevisionDraft), 0)
828810
t.Require().NoError(err)
829811
t.Require().Equal(1, publishedPR.Key().Revision)
830812
t.Require().Equal(porchapi.PackageRevisionLifecyclePublished, publishedPR.Lifecycle(ctx))

‎pkg/cache/dbcache/dbpackagerevisionsql.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func pkgRevReadFromDB(ctx context.Context, prk repository.PackageRevisionKey, re
5454
package_revisions.latest,
5555
package_revisions.tasks,
5656
package_revisions.kptfile_status,
57-
package_revisions.resources_size
57+
package_revisions.resources_size,
5858
package_revisions.last_pushed_commit,
5959
package_revisions.last_pushed_commit_timestamp,
6060
package_revisions.last_pushed_db_updated
@@ -130,7 +130,7 @@ func pkgRevListPRsFromDB(ctx context.Context, filter repository.ListPackageRevis
130130
package_revisions.latest,
131131
package_revisions.tasks,
132132
package_revisions.kptfile_status,
133-
package_revisions.resources_size
133+
package_revisions.resources_size,
134134
package_revisions.last_pushed_commit,
135135
package_revisions.last_pushed_commit_timestamp,
136136
package_revisions.last_pushed_db_updated
@@ -183,7 +183,7 @@ func pkgRevReadPRsFromDB(ctx context.Context, pk repository.PackageKey) ([]*dbPa
183183
package_revisions.latest,
184184
package_revisions.tasks,
185185
package_revisions.kptfile_status,
186-
package_revisions.resources_size
186+
package_revisions.resources_size,
187187
package_revisions.last_pushed_commit,
188188
package_revisions.last_pushed_commit_timestamp,
189189
package_revisions.last_pushed_db_updated
@@ -237,7 +237,7 @@ func pkgRevReadLatestPRFromDB(ctx context.Context, pk repository.PackageKey) (*d
237237
package_revisions.latest,
238238
package_revisions.tasks,
239239
package_revisions.kptfile_status,
240-
package_revisions.resources_size
240+
package_revisions.resources_size,
241241
package_revisions.last_pushed_commit,
242242
package_revisions.last_pushed_commit_timestamp,
243243
package_revisions.last_pushed_db_updated
@@ -382,7 +382,7 @@ func pkgRevWriteToDB(ctx context.Context, pr *dbPackageRevision) error {
382382
klog.V(5).Infof("pkgRevWriteToDB: writing package revision %+v", pr.Key())
383383

384384
sqlStatement := `
385-
INSERT INTO package_revisions (k8s_name_space, k8s_name, package_k8s_name, revision, meta, spec, updated, updatedby, lifecycle, ext_pr_id, tasks, kptfile_status, resources_size, upstream_ref_name, , last_pushed_commit, last_pushed_commit_timestamp, last_pushed_db_updated)
385+
INSERT INTO package_revisions (k8s_name_space, k8s_name, package_k8s_name, revision, meta, spec, updated, updatedby, lifecycle, ext_pr_id, tasks, kptfile_status, resources_size, upstream_ref_name, last_pushed_commit, last_pushed_commit_timestamp, last_pushed_db_updated)
386386
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)
387387
`
388388

‎pkg/cache/dbcache/dbpushtogit_test.go‎

Lines changed: 30 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func TestPushPublishedPackageRevision_PushDraftsDisabled(t *testing.T) {
145145

146146
tt.setupMocks(mockRepo, mockPR, mockPRD)
147147

148-
_, err := PushPackageRevision(ctx, mockRepo, mockPR, false, nil)
148+
_, _, err := PushPublishedPackageRevision(ctx, mockRepo, mockPR, false, false)
149149
if tt.expectError {
150150
assert.NotNil(t, err)
151151
} else {
@@ -159,71 +159,63 @@ func TestPushPublishedPackageRevision_PushDraftsEnabled(t *testing.T) {
159159
ctx := context.TODO()
160160

161161
tests := []struct {
162-
name string
163-
setupMocks func(*mockrepo.MockRepository, *mockrepo.MockPackageRevision, *mockrepo.MockPackageRevision, *mockrepo.MockPackageRevisionDraft)
164-
gitPR bool
165-
expectError bool
162+
name string
163+
setupMocks func(*mockrepo.MockRepository, *mockrepo.MockPackageRevision, *mockrepo.MockPackageRevision, *mockrepo.MockPackageRevisionDraft)
164+
existingGitBranch bool
165+
expectError bool
166166
}{
167167
{
168-
name: "Update existing PR",
169-
gitPR: true,
170-
setupMocks: func(mockRepo *mockrepo.MockRepository, mockPR *mockrepo.MockPackageRevision, mockGitPR *mockrepo.MockPackageRevision, mockPRD *mockrepo.MockPackageRevisionDraft) {
171-
mockPR.EXPECT().Lifecycle(mock.Anything).Return(porchapi.PackageRevisionLifecyclePublished).Once()
172-
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{}, nil).Once()
173-
mockPR.EXPECT().GetResources(mock.Anything).Return(&porchapi.PackageRevisionResources{}, nil).Once()
174-
mockRepo.EXPECT().UpdatePackageRevision(mock.Anything, mockGitPR).Return(mockPRD, nil).Once()
175-
mockPRD.EXPECT().UpdateLifecycle(mock.Anything, porchapi.PackageRevisionLifecyclePublished).Return(nil).Once()
176-
mockRepo.EXPECT().ClosePackageRevisionDraft(mock.Anything, mockPRD, mock.Anything).Return(mockPR, nil).Once()
177-
mockPR.EXPECT().GetLock(mock.Anything).Return(kptfilev1.Upstream{}, kptfilev1.Locator{}, nil).Once()
178-
},
179-
expectError: false,
180-
},
181-
{
182-
name: "Existing PR found via list",
183-
gitPR: false,
168+
name: "Update existing PR",
169+
existingGitBranch: true,
184170
setupMocks: func(mockRepo *mockrepo.MockRepository, mockPR *mockrepo.MockPackageRevision, mockGitPR *mockrepo.MockPackageRevision, mockPRD *mockrepo.MockPackageRevisionDraft) {
185171
mockPR.EXPECT().Lifecycle(mock.Anything).Return(porchapi.PackageRevisionLifecyclePublished).Once()
186172
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{}, nil).Once()
187173
mockPR.EXPECT().GetResources(mock.Anything).Return(&porchapi.PackageRevisionResources{}, nil).Once()
188174
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return([]repository.PackageRevision{mockGitPR}, nil).Once()
189175
mockRepo.EXPECT().UpdatePackageRevision(mock.Anything, mockGitPR).Return(mockPRD, nil).Once()
176+
mockPRD.EXPECT().UpdateResources(mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
190177
mockPRD.EXPECT().UpdateLifecycle(mock.Anything, porchapi.PackageRevisionLifecyclePublished).Return(nil).Once()
191178
mockRepo.EXPECT().ClosePackageRevisionDraft(mock.Anything, mockPRD, mock.Anything).Return(mockPR, nil).Once()
192179
mockPR.EXPECT().GetLock(mock.Anything).Return(kptfilev1.Upstream{}, kptfilev1.Locator{}, nil).Once()
193180
},
194181
expectError: false,
195182
},
196183
{
197-
name: "UpdatePackageRevision fails when gitPR provided",
198-
gitPR: true,
184+
name: "UpdatePackageRevision fails when existing git branch found",
185+
existingGitBranch: true,
199186
setupMocks: func(mockRepo *mockrepo.MockRepository, mockPR *mockrepo.MockPackageRevision, mockGitPR *mockrepo.MockPackageRevision, mockPRD *mockrepo.MockPackageRevisionDraft) {
200187
mockPR.EXPECT().Lifecycle(mock.Anything).Return(porchapi.PackageRevisionLifecyclePublished).Once()
201188
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{}, nil).Once()
202189
mockPR.EXPECT().GetResources(mock.Anything).Return(&porchapi.PackageRevisionResources{}, nil).Once()
190+
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return([]repository.PackageRevision{mockGitPR}, nil).Once()
203191
mockRepo.EXPECT().UpdatePackageRevision(mock.Anything, mockGitPR).Return(nil, assert.AnError).Once()
204192
},
205193
expectError: true,
206194
},
207195
{
208-
name: "UpdatePackageRevision fails when gitPR found via list",
209-
gitPR: false,
196+
name: "ListPackageRevisions fails and falls back to creating package revision draft",
197+
existingGitBranch: true,
210198
setupMocks: func(mockRepo *mockrepo.MockRepository, mockPR *mockrepo.MockPackageRevision, mockGitPR *mockrepo.MockPackageRevision, mockPRD *mockrepo.MockPackageRevisionDraft) {
211199
mockPR.EXPECT().Lifecycle(mock.Anything).Return(porchapi.PackageRevisionLifecyclePublished).Once()
212-
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{}, nil).Once()
200+
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{Spec: porchapi.PackageRevisionSpec{Tasks: []porchapi.Task{{Type: porchapi.TaskTypePush}}}}, nil).Once()
213201
mockPR.EXPECT().GetResources(mock.Anything).Return(&porchapi.PackageRevisionResources{}, nil).Once()
214-
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return([]repository.PackageRevision{mockGitPR}, nil).Once()
215-
mockRepo.EXPECT().UpdatePackageRevision(mock.Anything, mockGitPR).Return(nil, assert.AnError).Once()
202+
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return(nil, assert.AnError).Once()
203+
mockRepo.EXPECT().CreatePackageRevisionDraft(mock.Anything, mock.Anything).Return(mockPRD, nil).Once()
204+
mockPRD.EXPECT().UpdateResources(mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
205+
mockPRD.EXPECT().UpdateLifecycle(mock.Anything, porchapi.PackageRevisionLifecyclePublished).Return(nil).Once()
206+
mockRepo.EXPECT().ClosePackageRevisionDraft(mock.Anything, mockPRD, mock.Anything).Return(mockPR, nil).Once()
207+
mockPR.EXPECT().GetLock(mock.Anything).Return(kptfilev1.Upstream{}, kptfilev1.Locator{}, nil).Once()
216208
},
217-
expectError: true,
209+
expectError: false,
218210
},
219211
{
220-
name: "ListPackageRevisions fails and falls back to creating package revision draft",
221-
gitPR: false,
212+
name: "ListPackageRevisions returns empty and falls back to creating package revision draft",
213+
existingGitBranch: true,
222214
setupMocks: func(mockRepo *mockrepo.MockRepository, mockPR *mockrepo.MockPackageRevision, mockGitPR *mockrepo.MockPackageRevision, mockPRD *mockrepo.MockPackageRevisionDraft) {
223215
mockPR.EXPECT().Lifecycle(mock.Anything).Return(porchapi.PackageRevisionLifecyclePublished).Once()
224-
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{Spec: porchapi.PackageRevisionSpec{Tasks: []porchapi.Task{{Type: porchapi.TaskTypePush}}}}, nil).Once()
216+
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{}, nil).Once()
225217
mockPR.EXPECT().GetResources(mock.Anything).Return(&porchapi.PackageRevisionResources{}, nil).Once()
226-
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return(nil, assert.AnError).Once()
218+
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return([]repository.PackageRevision{}, nil).Once()
227219
mockRepo.EXPECT().CreatePackageRevisionDraft(mock.Anything, mock.Anything).Return(mockPRD, nil).Once()
228220
mockPRD.EXPECT().UpdateResources(mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
229221
mockPRD.EXPECT().UpdateLifecycle(mock.Anything, porchapi.PackageRevisionLifecyclePublished).Return(nil).Once()
@@ -233,13 +225,12 @@ func TestPushPublishedPackageRevision_PushDraftsEnabled(t *testing.T) {
233225
expectError: false,
234226
},
235227
{
236-
name: "ListPackageRevisions returns empty and falls back to creating package revision draft",
237-
gitPR: false,
228+
name: "Creates new draft when no existing git branch",
229+
existingGitBranch: false,
238230
setupMocks: func(mockRepo *mockrepo.MockRepository, mockPR *mockrepo.MockPackageRevision, mockGitPR *mockrepo.MockPackageRevision, mockPRD *mockrepo.MockPackageRevisionDraft) {
239231
mockPR.EXPECT().Lifecycle(mock.Anything).Return(porchapi.PackageRevisionLifecyclePublished).Once()
240232
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{}, nil).Once()
241233
mockPR.EXPECT().GetResources(mock.Anything).Return(&porchapi.PackageRevisionResources{}, nil).Once()
242-
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return([]repository.PackageRevision{}, nil).Once()
243234
mockRepo.EXPECT().CreatePackageRevisionDraft(mock.Anything, mock.Anything).Return(mockPRD, nil).Once()
244235
mockPRD.EXPECT().UpdateResources(mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
245236
mockPRD.EXPECT().UpdateLifecycle(mock.Anything, porchapi.PackageRevisionLifecyclePublished).Return(nil).Once()
@@ -260,14 +251,9 @@ func TestPushPublishedPackageRevision_PushDraftsEnabled(t *testing.T) {
260251
mockRepo.EXPECT().Key().Return(repository.RepositoryKey{}).Maybe()
261252
mockPR.EXPECT().Key().Return(repository.PackageRevisionKey{}).Maybe()
262253

263-
var gitPR repository.PackageRevision
264-
if tt.gitPR {
265-
gitPR = mockGitPR
266-
}
267-
268254
tt.setupMocks(mockRepo, mockPR, mockGitPR, mockPRD)
269255

270-
_, err := PushPackageRevision(ctx, mockRepo, mockPR, true, gitPR)
256+
_, _, err := PushPublishedPackageRevision(ctx, mockRepo, mockPR, true, tt.existingGitBranch)
271257
if tt.expectError {
272258
assert.NotNil(t, err)
273259
} else {
@@ -283,35 +269,15 @@ func TestGetOrCreateGitDraft(t *testing.T) {
283269
tests := []struct {
284270
name string
285271
setupMocks func(*mockrepo.MockRepository, *mockrepo.MockPackageRevision, *mockrepo.MockPackageRevision, *mockrepo.MockPackageRevisionDraft)
286-
gitPR bool
287272
expectError bool
288273
expectUpdatedGitPR bool
289274
}{
290275
{
291-
name: "UpdatePackageRevision succeeds",
292-
setupMocks: func(mockRepo *mockrepo.MockRepository, mockPR *mockrepo.MockPackageRevision, mockGitPR *mockrepo.MockPackageRevision, mockPRD *mockrepo.MockPackageRevisionDraft) {
293-
mockRepo.EXPECT().UpdatePackageRevision(mock.Anything, mockGitPR).Return(mockPRD, nil).Once()
294-
},
295-
gitPR: true,
296-
expectError: false,
297-
expectUpdatedGitPR: true,
298-
},
299-
{
300-
name: "UpdatePackageRevision fails",
301-
setupMocks: func(mockRepo *mockrepo.MockRepository, mockPR *mockrepo.MockPackageRevision, mockGitPR *mockrepo.MockPackageRevision, mockPRD *mockrepo.MockPackageRevisionDraft) {
302-
mockRepo.EXPECT().UpdatePackageRevision(mock.Anything, mockGitPR).Return(nil, assert.AnError).Once()
303-
},
304-
gitPR: true,
305-
expectError: true,
306-
expectUpdatedGitPR: false,
307-
},
308-
{
309-
name: "Existing PRs found",
276+
name: "UpdatePackageRevision succeeds when existing PRs found",
310277
setupMocks: func(mockRepo *mockrepo.MockRepository, mockPR *mockrepo.MockPackageRevision, mockGitPR *mockrepo.MockPackageRevision, mockPRD *mockrepo.MockPackageRevisionDraft) {
311278
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return([]repository.PackageRevision{mockGitPR}, nil).Once()
312279
mockRepo.EXPECT().UpdatePackageRevision(mock.Anything, mockGitPR).Return(mockPRD, nil).Once()
313280
},
314-
gitPR: false,
315281
expectError: false,
316282
expectUpdatedGitPR: true,
317283
},
@@ -321,7 +287,6 @@ func TestGetOrCreateGitDraft(t *testing.T) {
321287
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return([]repository.PackageRevision{mockGitPR}, nil).Once()
322288
mockRepo.EXPECT().UpdatePackageRevision(mock.Anything, mockGitPR).Return(nil, assert.AnError).Once()
323289
},
324-
gitPR: false,
325290
expectError: true,
326291
expectUpdatedGitPR: false,
327292
},
@@ -332,7 +297,6 @@ func TestGetOrCreateGitDraft(t *testing.T) {
332297
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{}, nil).Once()
333298
mockRepo.EXPECT().CreatePackageRevisionDraft(mock.Anything, mock.Anything).Return(mockPRD, nil).Once()
334299
},
335-
gitPR: false,
336300
expectError: false,
337301
expectUpdatedGitPR: false,
338302
},
@@ -343,7 +307,6 @@ func TestGetOrCreateGitDraft(t *testing.T) {
343307
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{}, nil).Once()
344308
mockRepo.EXPECT().CreatePackageRevisionDraft(mock.Anything, mock.Anything).Return(mockPRD, nil).Once()
345309
},
346-
gitPR: false,
347310
expectError: false,
348311
expectUpdatedGitPR: false,
349312
},
@@ -353,7 +316,6 @@ func TestGetOrCreateGitDraft(t *testing.T) {
353316
mockRepo.EXPECT().ListPackageRevisions(mock.Anything, mock.Anything).Return([]repository.PackageRevision{}, nil).Once()
354317
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(nil, assert.AnError).Once()
355318
},
356-
gitPR: false,
357319
expectError: true,
358320
expectUpdatedGitPR: false,
359321
},
@@ -364,7 +326,6 @@ func TestGetOrCreateGitDraft(t *testing.T) {
364326
mockPR.EXPECT().GetPackageRevision(mock.Anything).Return(&porchapi.PackageRevision{}, nil).Once()
365327
mockRepo.EXPECT().CreatePackageRevisionDraft(mock.Anything, mock.Anything).Return(nil, assert.AnError).Once()
366328
},
367-
gitPR: false,
368329
expectError: true,
369330
expectUpdatedGitPR: false,
370331
},
@@ -379,14 +340,9 @@ func TestGetOrCreateGitDraft(t *testing.T) {
379340

380341
mockPR.EXPECT().Key().Return(repository.PackageRevisionKey{}).Maybe()
381342

382-
var gitPR repository.PackageRevision
383-
if tt.gitPR {
384-
gitPR = mockGitPR
385-
}
386-
387343
tt.setupMocks(mockRepo, mockPR, mockGitPR, mockPRD)
388344

389-
draft, updatedGitPR, err := GetOrCreateGitDraft(ctx, mockRepo, mockPR, gitPR)
345+
draft, updatedGitPR, err := GetOrCreateGitDraft(ctx, mockRepo, mockPR)
390346

391347
if tt.expectError {
392348
assert.NotNil(t, err)

0 commit comments

Comments
 (0)