Skip to content

test: fix merge breakage#16597

Merged
alyssawilk merged 1 commit intoenvoyproxy:mainfrom
alyssawilk:mergefix
May 20, 2021
Merged

test: fix merge breakage#16597
alyssawilk merged 1 commit intoenvoyproxy:mainfrom
alyssawilk:mergefix

Conversation

@alyssawilk
Copy link
Copy Markdown
Contributor

No description provided.

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@alyssawilk
Copy link
Copy Markdown
Contributor Author

(the unit test in #16569 didn't play well with lazy-cert loading in #16462)

This fixes by loading fake secrets in the unit tests, and not returning (and dereferencing) a null session.

@alyssawilk alyssawilk merged commit 2b9fb47 into envoyproxy:main May 20, 2021
leyao-daily pushed a commit to leyao-daily/envoy that referenced this pull request Sep 30, 2021
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@alyssawilk alyssawilk deleted the mergefix branch February 28, 2022 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants