Make EXPECT_ENVOY_BUG not leak between test cases (#30844)

* Make EXPECT_ENVOY_BUG not leak between test cases

Signed-off-by: Raven Black <[email protected]>

* Use the public interface

Signed-off-by: Raven Black <[email protected]>

* include assert.h

Signed-off-by: Raven Black <[email protected]>

* Strict namespace

Signed-off-by: Raven Black <[email protected]>

* Don't expect non-logging for quic

Signed-off-by: Raven Black <[email protected]>

---------

Signed-off-by: Raven Black <[email protected]>

Author: ravenblackx

test/common/quic/platform/quic_platform_test.cc

@@ -110,17 +110,9 @@ TEST_F(QuicPlatformTest, QuicClientStats) {
 
 TEST_F(QuicPlatformTest, QuicExpectBug) {
   auto bug = [](const char* error_message) { QUIC_BUG(bug_id) << error_message; };
-
   auto peer_bug = [](const char* error_message) { QUIC_PEER_BUG(bug_id) << error_message; };
   EXPECT_QUIC_BUG(bug("bug one is expected"), "bug one");
   EXPECT_QUIC_BUG(bug("bug two is expected"), "bug two");
-#ifdef NDEBUG
-  // The 3rd triggering in release mode should not be logged.
-  EXPECT_LOG_NOT_CONTAINS("error", "bug three", bug("bug three is expected"));
-#else
-  EXPECT_QUIC_BUG(bug("bug three is expected"), "bug three");
-#endif
-
   EXPECT_QUIC_PEER_BUG(peer_bug("peer_bug_1 is expected"), "peer_bug_1");
   EXPECT_QUIC_PEER_BUG(peer_bug("peer_bug_2 is expected"), "peer_bug_2");
 }

test/extensions/filters/http/cache/cache_filter_test.cc

@@ -1150,21 +1150,18 @@ TEST_F(CacheFilterDeathTest, StreamTimeoutDuringLookup) {
 }
 
 TEST(LookupStatusDeathTest, ResolveLookupStatusRequireValidationAndInitialIsBug) {
-  GTEST_SKIP(); // TODO(issue #29217): Remove skip.
   EXPECT_ENVOY_BUG(
       CacheFilter::resolveLookupStatus(CacheEntryStatus::RequiresValidation, FilterState::Initial),
       "Unexpected filter state in requestCacheStatus");
 }
 
 TEST(LookupStatusDeathTest, ResolveLookupStatusRequireValidationAndDecodeServingFromCacheIsBug) {
-  GTEST_SKIP(); // TODO(issue #29217): Remove skip.
   EXPECT_ENVOY_BUG(CacheFilter::resolveLookupStatus(CacheEntryStatus::RequiresValidation,
                                                     FilterState::DecodeServingFromCache),
                    "Unexpected filter state in requestCacheStatus");
 }
 
 TEST(LookupStatusDeathTest, ResolveLookupStatusRequireValidationAndDestroyedIsBug) {
-  GTEST_SKIP(); // TODO(issue #29217): Remove skip.
   EXPECT_ENVOY_BUG(CacheFilter::resolveLookupStatus(CacheEntryStatus::RequiresValidation,
                                                     FilterState::Destroyed),
                    "Unexpected filter state in requestCacheStatus");

test/test_common/logging.h

@@ -4,6 +4,7 @@
 #include <string>
 #include <vector>
 
+#include "source/common/common/assert.h"
 #include "source/common/common/logger.h"
 
 #include "absl/strings/str_join.h"
@@ -97,6 +98,7 @@ using ExpectedLogMessages = std::vector<StringPair>;
 #define EXPECT_LOG_CONTAINS_ALL_OF_HELPER(expected_messages, stmt, escaped)                        \
   do {                                                                                             \
     ASSERT_FALSE(expected_messages.empty()) << "Expected messages cannot be empty.";               \
+    ::Envoy::Assert::resetEnvoyBugCountersForTest();                                               \
     Envoy::LogLevelSetter save_levels(spdlog::level::trace);                                       \
     Envoy::Logger::DelegatingLogSinkSharedPtr sink_ptr = Envoy::Logger::Registry::getSink();       \
     sink_ptr->setShouldEscape(escaped);                                                            \