Skip to content

Commit

Permalink
resolve the conflict
Browse files Browse the repository at this point in the history
Signed-off-by: charlie <qianglin98@qq.com>
  • Loading branch information
Charlie17Li committed Feb 1, 2023
1 parent c7fd187 commit 59b7255
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/ingress/mcp/generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ func TestGenerate(t *testing.T) {
},
{
name: "ServiceEntry",
fn: func() *model.PushContext {
fn: func() (*model.PushContext, any) {
ctx := model.NewPushContext()
cfg := config.Config{
Spec: &networking.ServiceEntry{},
}
ctx.AllServiceEntries = []config.Config{cfg}
return ctx
return ctx, cfg.Spec
},
generator: ServiceEntryGenerator{},
isErr: false,
Expand Down

0 comments on commit 59b7255

Please sign in to comment.