Skip to content

test: Fix all tests that were failing the test-base assert due to multi-inheritance order.#5855

Merged
jmarantz merged 3 commits intoenvoyproxy:masterfrom
jmarantz:enable-test-base-assert
Feb 6, 2019
Merged

test: Fix all tests that were failing the test-base assert due to multi-inheritance order.#5855
jmarantz merged 3 commits intoenvoyproxy:masterfrom
jmarantz:enable-test-base-assert

Conversation

@jmarantz
Copy link
Copy Markdown
Contributor

@jmarantz jmarantz commented Feb 6, 2019

Description: Previously the TestBase destructor was running the singleton quiescence check and printing the results, but not actually failing the tests..

There are two changes here:

  • use a RELEASE_ASSERT in the quiescence check helper function, rather than returning a bool
  • change a bunch of tests that multiply inherited from the TestBase class to always specify the TestBase class first.

Risk Level: low
Testing: //test/...
Docs Changes: n/a
Release Notes: n/a

…eritance order.

Signed-off-by: Joshua Marantz <jmarantz@google.com>
@htuch
Copy link
Copy Markdown
Member

htuch commented Feb 6, 2019

@jmarantz can you merge master?

@htuch htuch self-assigned this Feb 6, 2019
Signed-off-by: Joshua Marantz <jmarantz@google.com>
@jmarantz
Copy link
Copy Markdown
Contributor Author

jmarantz commented Feb 6, 2019

Yup, merging master erased my change to test/fuzz/main.cc.

Copy link
Copy Markdown
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@jmarantz jmarantz changed the title WiP: test: Fix all tests that were failing the test-base assert due to multi-inheritance order. test: Fix all tests that were failing the test-base assert due to multi-inheritance order. Feb 6, 2019
Signed-off-by: Joshua Marantz <jmarantz@google.com>
@jmarantz jmarantz merged commit f2511a3 into envoyproxy:master Feb 6, 2019
@jmarantz jmarantz deleted the enable-test-base-assert branch February 6, 2019 22:49
fredlas pushed a commit to fredlas/envoy that referenced this pull request Mar 5, 2019
…eritance order. (envoyproxy#5855)

Signed-off-by: Joshua Marantz <jmarantz@google.com>

Previously the TestBase destructor was running the singleton quiescence check and printing the results, but not actually failing the tests..

There are two changes here:

* use a RELEASE_ASSERT in the quiescence check helper function, rather than returning a bool
* change a bunch of tests that multiply inherited from the TestBase class to always specify the TestBase class first.

Signed-off-by: Fred Douglas <fredlas@google.com>
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