Skip to content

Commit

Permalink
bad merge
Browse files Browse the repository at this point in the history
Signed-off-by: Zach Aller <[email protected]>
  • Loading branch information
zachaller committed Dec 10, 2024
1 parent fa81485 commit 79bda52
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rollout/trafficrouting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ func TestDynamicScalingDecreaseWeightAccordingToStableAvailabilityWhenAbortedAnd
f.objects = append(f.objects, r2)

f.expectPatchRolloutAction(r2)
//f.expectPatchServiceAction(canarySvc, rs1PodHash)
f.expectPatchServiceAction(canarySvc, rs1PodHash)

f.fakeTrafficRouting = newUnmockedFakeTrafficRoutingReconciler()
f.fakeTrafficRouting.On("UpdateHash", mock.Anything, mock.Anything, mock.Anything).Return(nil)
Expand Down

0 comments on commit 79bda52

Please sign in to comment.