x

ctiller · Jan 28, 2025 · 3139e9d · 3139e9d
1 parent 113b6d8
commit 3139e9d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 20 deletions.
diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc
@@ -734,21 +734,23 @@ std::vector<CoreTestConfiguration> DefaultConfigs() {
                 UDS);
           }},
 #endif
-      CoreTestConfiguration{"Chttp2FullstackNoRetry",
+      CoreTestConfiguration{
+          "Chttp2FullstackNoRetry",
+          FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
+              FEATURE_MASK_DOES_NOT_SUPPORT_RETRY | FEATURE_MASK_DO_NOT_GTEST,
+          nullptr,
+          [](const ChannelArgs& /*client_args*/,
+             const ChannelArgs& /*server_args*/) {
+            return std::make_unique<NoRetryFixture>();
+          }},
+      CoreTestConfiguration{"Chttp2FullstackWithCensus",
                             FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
                                 FEATURE_MASK_IS_HTTP2 |
-                                FEATURE_MASK_DOES_NOT_SUPPORT_RETRY,
+                                FEATURE_MASK_DO_NOT_GTEST,
                             nullptr,
-                            [](const ChannelArgs& /*client_args*/,
-                               const ChannelArgs& /*server_args*/) {
-                              return std::make_unique<NoRetryFixture>();
+                            [](const ChannelArgs&, const ChannelArgs&) {
+                              return std::make_unique<CensusFixture>();
                             }},
-      CoreTestConfiguration{
-          "Chttp2FullstackWithCensus",
-          FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2, nullptr,
-          [](const ChannelArgs&, const ChannelArgs&) {
-            return std::make_unique<CensusFixture>();
-          }},
       CoreTestConfiguration{
           "Chttp2FullstackWithProxy",
           FEATURE_MASK_SUPPORTS_REQUEST_PROXYING |
@@ -780,7 +782,9 @@ std::vector<CoreTestConfiguration> DefaultConfigs() {
           "Chttp2InsecureCredentials",
           FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
               FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS_LEVEL_INSECURE |
-              FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
+              FEATURE_MASK_IS_HTTP2 |
+              FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS |
+              FEATURE_MASK_DO_NOT_GTEST,
           nullptr,
           [](const ChannelArgs&, const ChannelArgs&) {
             return std::make_unique<InsecureCredsFixture>();
@@ -790,15 +794,17 @@ std::vector<CoreTestConfiguration> DefaultConfigs() {
           "Chttp2SimpleSslWithOauth2FullstackTls12",
           FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
               FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
-              FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
+              FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS |
+              FEATURE_MASK_DO_NOT_GTEST,
           "foo.test.google.fr",
           [](const ChannelArgs&, const ChannelArgs&) {
             return std::make_unique<Oauth2Fixture>(grpc_tls_version::TLS1_2);
           }},
       CoreTestConfiguration{
           "Chttp2SimpleSslWithOauth2FullstackTls13",
           FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
-              FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2,
+              FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
+              FEATURE_MASK_DO_NOT_GTEST,
           "foo.test.google.fr",
           [](const ChannelArgs&, const ChannelArgs&) {
             return std::make_unique<Oauth2Fixture>(grpc_tls_version::TLS1_3);
@@ -807,7 +813,8 @@ std::vector<CoreTestConfiguration> DefaultConfigs() {
           "Chttp2SimplSslFullstackTls12",
           FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
               FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_IS_HTTP2 |
-              FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS,
+              FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS |
+              FEATURE_MASK_DO_NOT_GTEST,
           "foo.test.google.fr",
           [](const ChannelArgs&, const ChannelArgs&) {
             return std::make_unique<SslTlsFixture>(grpc_tls_version::TLS1_2);
@@ -817,7 +824,7 @@ std::vector<CoreTestConfiguration> DefaultConfigs() {
           FEATURE_MASK_IS_SECURE | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS |
               FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL |
               FEATURE_MASK_DOES_NOT_SUPPORT_CLIENT_HANDSHAKE_COMPLETE_FIRST |
-              FEATURE_MASK_IS_HTTP2,
+              FEATURE_MASK_IS_HTTP2 | FEATURE_MASK_DO_NOT_GTEST,
           "foo.test.google.fr",
           [](const ChannelArgs&, const ChannelArgs&) {
             return std::make_unique<SslTlsFixture>(grpc_tls_version::TLS1_3);
@@ -1063,6 +1070,13 @@ std::vector<CoreTestConfiguration> DefaultConfigs() {
 
 std::vector<CoreTestConfiguration> AllConfigs() {
   std::vector<CoreTestConfiguration> configs = DefaultConfigs();
+  for (const auto& config : configs) {
+    // Setting both no gtest && no fuzz == no config -- better to delete it
+    CHECK_NE(config.feature_mask &
+                 (FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_DO_NOT_GTEST),
+             FEATURE_MASK_DO_NOT_FUZZ | FEATURE_MASK_DO_NOT_GTEST)
+        << "Config specified with no fuzz, no gtest: " << config.name;
+  }
   std::sort(configs.begin(), configs.end(),
             [](const CoreTestConfiguration& a, const CoreTestConfiguration& b) {
               return strcmp(a.name, b.name) < 0;
@@ -1091,7 +1105,7 @@ class ConfigQuery {
     if (fuzzing) {
       exclude_features_ |= FEATURE_MASK_DO_NOT_FUZZ;
     } else {
-      enforce_features_ |= FEATURE_MASK_DO_NOT_FUZZ;
+      exclude_features_ |= FEATURE_MASK_DO_NOT_GTEST;
     }
   }
   ConfigQuery(const ConfigQuery&) = delete;

diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h
@@ -88,10 +88,11 @@
 #define FEATURE_MASK_IS_MINSTACK (1 << 11)
 #define FEATURE_MASK_IS_SECURE (1 << 12)
 #define FEATURE_MASK_DO_NOT_FUZZ (1 << 13)
+#define FEATURE_MASK_DO_NOT_GTEST (1 << 14)
 // Exclude this fixture from experiment runs
-#define FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS (1 << 14)
-#define FEATURE_MASK_IS_CALL_V3 (1 << 15)
-#define FEATURE_MASK_IS_LOCAL_TCP_CREDS (1 << 16)
+#define FEATURE_MASK_EXCLUDE_FROM_EXPERIMENT_RUNS (1 << 15)
+#define FEATURE_MASK_IS_CALL_V3 (1 << 16)
+#define FEATURE_MASK_IS_LOCAL_TCP_CREDS (1 << 17)
 
 #define FAIL_AUTH_CHECK_SERVER_ARG_NAME "fail_auth_check"