Skip to content

stats: clear the stats storage before asserting the symbol table is empty.#10245

Merged
mattklein123 merged 3 commits intoenvoyproxy:masterfrom
jmarantz:prometheus-race
Mar 4, 2020
Merged

stats: clear the stats storage before asserting the symbol table is empty.#10245
mattklein123 merged 3 commits intoenvoyproxy:masterfrom
jmarantz:prometheus-race

Conversation

@jmarantz
Copy link
Contributor

@jmarantz jmarantz commented Mar 4, 2020

Description: fixes a coverage-test issue related to keeping whether we use real/fake symbol tables in a static that is not cleared at the end of tests. Also reset that at the end of tests via RAII.
Risk Level: low
Testing: //test/...
Docs Changes: n/a
Release Notes: n/a

jmarantz added 3 commits March 3, 2020 19:58
Signed-off-by: Joshua Marantz <jmarantz@google.com>
Signed-off-by: Joshua Marantz <jmarantz@google.com>
Signed-off-by: Joshua Marantz <jmarantz@google.com>
@jmarantz
Copy link
Contributor Author

jmarantz commented Mar 4, 2020

/retest

@repokitteh-read-only
Copy link

🔨 rebuilding ci/circleci: coverage (failed build)

🐱

Caused by: a #10245 (comment) was created by @jmarantz.

see: more, trace.

@jmarantz
Copy link
Contributor Author

jmarantz commented Mar 4, 2020

@mattklein123 this may be a candidate for force-merging as though it's being bitten by one all-tests-in-one-binary issue, it resolves another one,. And I think it's obvious this is coverage neutral.

FWIW you can argue I could rename the testing-peer class to the fact that it's now really a context, or that could be a follow-up. Up to you.

@mattklein123 mattklein123 merged commit 6988bd2 into envoyproxy:master Mar 4, 2020
@jmarantz jmarantz deleted the prometheus-race branch March 5, 2020 03:46
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.

2 participants