diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index db93973b1ad..d49bd4e4070 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -872,12 +872,6 @@ class CoreEnd2endTestRegistry { if (!g_is_fuzzing_core_e2e_tests && grpc_core::IsEventEngineClientEnabled()) \ GTEST_SKIP() << "Skipping test to prevent it from using EventEngine client" -#define SKIP_IF_USES_EVENT_ENGINE_LISTENER() \ - if (!g_is_fuzzing_core_e2e_tests && \ - grpc_core::IsEventEngineListenerEnabled()) \ - GTEST_SKIP() << "Skipping test to prevent it from using EventEngine " \ - "listener" - #define SKIP_IF_FUZZING() \ if (g_is_fuzzing_core_e2e_tests) GTEST_SKIP() << "Skipping test for fuzzing" diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index 62b4df23fff..70c26a3bce7 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -80,7 +80,6 @@ CORE_END2END_TEST(CoreDeadlineTest, DeadlineAfterAccept) { CORE_END2END_TEST(CoreClientChannelTest, DeadlineAfterAcceptWithServiceConfig) { // TODO(vigneshbabu): re-enable these before release SKIP_IF_USES_EVENT_ENGINE_CLIENT(); - SKIP_IF_USES_EVENT_ENGINE_LISTENER(); InitServer(ChannelArgs()); InitClient(ChannelArgs().Set( GRPC_ARG_SERVICE_CONFIG, diff --git a/test/core/end2end/tests/cancel_after_invoke.cc b/test/core/end2end/tests/cancel_after_invoke.cc index 9f445c6479a..8c3ba490c1b 100644 --- a/test/core/end2end/tests/cancel_after_invoke.cc +++ b/test/core/end2end/tests/cancel_after_invoke.cc @@ -110,28 +110,24 @@ void CancelAfterInvoke3(CoreEnd2endTest& test, CORE_END2END_TEST(CoreEnd2endTest, CancelAfterInvoke6) { // TODO(vigneshbabu): re-enable these before release - SKIP_IF_USES_EVENT_ENGINE_LISTENER(); CancelAfterInvoke6(*this, std::make_unique(), kCancelTimeout); } CORE_END2END_TEST(CoreEnd2endTest, CancelAfterInvoke5) { // TODO(vigneshbabu): re-enable these before release - SKIP_IF_USES_EVENT_ENGINE_LISTENER(); CancelAfterInvoke5(*this, std::make_unique(), kCancelTimeout); } CORE_END2END_TEST(CoreEnd2endTest, CancelAfterInvoke4) { // TODO(vigneshbabu): re-enable these before release - SKIP_IF_USES_EVENT_ENGINE_LISTENER(); CancelAfterInvoke4(*this, std::make_unique(), kCancelTimeout); } CORE_END2END_TEST(CoreEnd2endTest, CancelAfterInvoke3) { // TODO(vigneshbabu): re-enable these before release - SKIP_IF_USES_EVENT_ENGINE_LISTENER(); CancelAfterInvoke3(*this, std::make_unique(), kCancelTimeout); } diff --git a/test/core/end2end/tests/cancel_with_status.cc b/test/core/end2end/tests/cancel_with_status.cc index 702222ebdf9..c6d402f1482 100644 --- a/test/core/end2end/tests/cancel_with_status.cc +++ b/test/core/end2end/tests/cancel_with_status.cc @@ -84,7 +84,6 @@ CORE_END2END_TEST(CoreEnd2endTest, CancelWithStatus3) { CORE_END2END_TEST(CoreEnd2endTest, CancelWithStatus4) { // TODO(vigneshbabu): re-enable these before release - SKIP_IF_USES_EVENT_ENGINE_LISTENER(); auto c = NewClientCall("/foo").Timeout(Duration::Seconds(5)).Create(); CoreEnd2endTest::IncomingMetadata server_initial_metadata; CoreEnd2endTest::IncomingStatusOnClient server_status; diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc index 08645cc1f3a..b092c0b11bd 100644 --- a/test/core/end2end/tests/simple_request.cc +++ b/test/core/end2end/tests/simple_request.cc @@ -100,7 +100,6 @@ void SimpleRequestBody(CoreEnd2endTest& test) { CORE_END2END_TEST(CoreEnd2endTest, SimpleRequest) { // TODO(vigneshbabu): re-enable these before release - SKIP_IF_USES_EVENT_ENGINE_LISTENER(); SimpleRequestBody(*this); }