Skip to content

Commit 456a47b

Browse files
tanvi-jagtapcopybara-github
tanvi-jagtap
authored and
copybara-github
committed
[PH2][Server] Differentiating between client and server in e2e tests
PiperOrigin-RevId: 871133581
1 parent ac678f5 commit 456a47b

11 files changed

+64
-60
lines changed

‎test/cpp/end2end/GEMINI.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ In the `BUILD` file, targets intended to be part of the core C++ end-to-end
4949
test suite are typically tagged with `"cpp_end2end_test"`.
5050
Reference for PH2 and cpp_end2end_test : src/core/lib/experiments/experiments.yaml
5151

52-
We have temporarily used SKIP_TEST_FOR_PH2 to mark tests that are failing for
53-
PH2 experiment, and are WIP.
52+
We have temporarily used SKIP_TEST_FOR_PH2_CLIENT and SKIP_TEST_FOR_PH2_SERVER
53+
to mark tests that are failing for PH2 experiment, and are WIP.
5454
ETA to finish : 30-Aug-2026. Owner : tjagtap
5555
For more information on PH2 refer file src/core/ext/transport/chttp2/GEMINI.md
5656

‎test/cpp/end2end/async_end2end_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ TEST_P(AsyncEnd2endTest, MetadataRpc) {
13081308
// Server uses AsyncNotifyWhenDone API to check for cancellation
13091309
TEST_P(AsyncEnd2endTest, ServerCheckCancellation) {
13101310
// TODO(akshitpatel) [PH2][P3][Client] Fix bug.
1311-
SKIP_TEST_FOR_PH2("WIP Timeout for PH2");
1311+
SKIP_TEST_FOR_PH2_CLIENT("WIP Timeout for PH2");
13121312
ResetStub();
13131313

13141314
EchoRequest send_request;
@@ -1910,14 +1910,14 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest {
19101910

19111911
TEST_P(AsyncEnd2endServerTryCancelTest, ClientStreamingServerTryCancelBefore) {
19121912
// TODO(akshitpatel) [PH2][P3][Client] Fix bug.
1913-
SKIP_TEST_FOR_PH2("WIP `Check failed` for PH2");
1913+
SKIP_TEST_FOR_PH2_CLIENT("WIP `Check failed` for PH2");
19141914
TestClientStreamingServerCancel(CANCEL_BEFORE_PROCESSING);
19151915
}
19161916

19171917
TEST_P(AsyncEnd2endServerTryCancelTest, ClientStreamingServerTryCancelDuring) {
19181918
// TODO(akshitpatel) [PH2][P3][Client] Fix bug. Likley same bug as
19191919
// ClientStreamingServerTryCancelBefore.
1920-
SKIP_TEST_FOR_PH2("WIP `Check failed` for PH2");
1920+
SKIP_TEST_FOR_PH2_CLIENT("WIP `Check failed` for PH2");
19211921
TestClientStreamingServerCancel(CANCEL_DURING_PROCESSING);
19221922
}
19231923

‎test/cpp/end2end/channelz_service_test.cc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ TEST_P(ChannelzServerTest, HighStartId) {
407407
}
408408

409409
TEST_P(ChannelzServerTest, SuccessfulRequestTest) {
410-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
410+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
411411
ResetStubs();
412412
ConfigureProxy(1);
413413
SendSuccessfulEcho(0);
@@ -423,7 +423,7 @@ TEST_P(ChannelzServerTest, SuccessfulRequestTest) {
423423
}
424424

425425
TEST_P(ChannelzServerTest, FailedRequestTest) {
426-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
426+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
427427
ResetStubs();
428428
ConfigureProxy(1);
429429
SendFailedEcho(0);
@@ -439,7 +439,7 @@ TEST_P(ChannelzServerTest, FailedRequestTest) {
439439
}
440440

441441
TEST_P(ChannelzServerTest, ManyRequestsTest) {
442-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
442+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
443443
ResetStubs();
444444
ConfigureProxy(1);
445445
// send some RPCs
@@ -477,7 +477,7 @@ TEST_P(ChannelzServerTest, ManyChannels) {
477477
}
478478

479479
TEST_P(ChannelzServerTest, ManySubchannels) {
480-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
480+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
481481
ResetStubs();
482482
const int kNumChannels = 4;
483483
ConfigureProxy(kNumChannels);
@@ -588,7 +588,7 @@ TEST_P(ChannelzServerTest, ServerCallTest) {
588588
}
589589

590590
TEST_P(ChannelzServerTest, ManySubchannelsAndSockets) {
591-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
591+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
592592
ResetStubs();
593593
const int kNumChannels = 4;
594594
ConfigureProxy(kNumChannels);
@@ -672,7 +672,7 @@ TEST_P(ChannelzServerTest, ManySubchannelsAndSockets) {
672672
}
673673

674674
TEST_P(ChannelzServerTest, StreamingRPC) {
675-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
675+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
676676
ResetStubs();
677677
ConfigureProxy(1);
678678
const int kNumMessages = 5;
@@ -797,7 +797,7 @@ TEST_P(ChannelzServerTest, GetServerSocketsTest) {
797797
}
798798

799799
TEST_P(ChannelzServerTest, GetServerSocketsPaginationTest) {
800-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
800+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
801801
ResetStubs();
802802
ConfigureProxy(1);
803803
std::vector<std::unique_ptr<grpc::testing::EchoTestService::Stub>> stubs;

‎test/cpp/end2end/client_lb_end2end_test.cc‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ TEST_F(PickFirstTest, SelectsReadyAtStartup) {
992992
}
993993

994994
TEST_F(PickFirstTest, BackOffInitialReconnect) {
995-
SKIP_TEST_FOR_PH2(
995+
SKIP_TEST_FOR_PH2_CLIENT(
996996
"TODO(tjagtap) [PH2][P3][Client] Flake less than 1 in 100 times");
997997
StartServers(1);
998998
ChannelArguments args;
@@ -1151,7 +1151,7 @@ TEST_F(ClientLbEnd2endTest,
11511151
}
11521152

11531153
TEST_F(PickFirstTest, Updates) {
1154-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix flake");
1154+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix flake");
11551155
// Start servers and send one RPC per server.
11561156
const int kNumServers = 3;
11571157
StartServers(kNumServers);
@@ -1608,7 +1608,7 @@ TEST_F(RoundRobinTest, ProcessPending) {
16081608
}
16091609

16101610
TEST_F(RoundRobinTest, Updates) {
1611-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
1611+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
16121612
// Start servers.
16131613
const int kNumServers = 3;
16141614
StartServers(kNumServers);
@@ -1810,7 +1810,7 @@ TEST_F(RoundRobinTest, FailsEmptyResolverUpdate) {
18101810
}
18111811

18121812
TEST_F(RoundRobinTest, TransientFailure) {
1813-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix flake");
1813+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix flake");
18141814
// Start servers and create channel. Channel should go to READY state.
18151815
const int kNumServers = 3;
18161816
StartServers(kNumServers);
@@ -1939,7 +1939,7 @@ TEST_F(RoundRobinTest, ReportsLatestStatusInTransientFailure) {
19391939
}
19401940

19411941
TEST_F(RoundRobinTest, DoesNotFailRpcsUponDisconnection) {
1942-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
1942+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
19431943
// Start connection injector.
19441944
ConnectionAttemptInjector injector;
19451945
// Start server.
@@ -1999,7 +1999,7 @@ TEST_F(RoundRobinTest, DoesNotFailRpcsUponDisconnection) {
19991999
}
20002000

20012001
TEST_F(RoundRobinTest, SingleReconnect) {
2002-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug (flake)");
2002+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug (flake)");
20032003
const int kNumServers = 3;
20042004
StartServers(kNumServers);
20052005
const auto ports = GetServersPorts();
@@ -2055,7 +2055,7 @@ TEST_F(RoundRobinTest, SingleReconnect) {
20552055
// If health checking is required by client but health checking service
20562056
// is not running on the server, the channel should be treated as healthy.
20572057
TEST_F(RoundRobinTest, ServersHealthCheckingUnimplementedTreatedAsHealthy) {
2058-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2058+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
20592059
StartServers(1); // Single server
20602060
ChannelArguments args;
20612061
args.SetServiceConfigJSON(
@@ -2070,7 +2070,7 @@ TEST_F(RoundRobinTest, ServersHealthCheckingUnimplementedTreatedAsHealthy) {
20702070
}
20712071

20722072
TEST_F(RoundRobinTest, HealthChecking) {
2073-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2073+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
20742074
EnableDefaultHealthCheckService(true);
20752075
// Start servers.
20762076
const int kNumServers = 3;
@@ -2158,7 +2158,7 @@ TEST_F(RoundRobinTest, HealthChecking) {
21582158
}
21592159

21602160
TEST_F(RoundRobinTest, HealthCheckingHandlesSubchannelFailure) {
2161-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2161+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
21622162
EnableDefaultHealthCheckService(true);
21632163
// Start servers.
21642164
const int kNumServers = 3;
@@ -2186,7 +2186,7 @@ TEST_F(RoundRobinTest, HealthCheckingHandlesSubchannelFailure) {
21862186
}
21872187

21882188
TEST_F(RoundRobinTest, WithHealthCheckingInhibitPerChannel) {
2189-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2189+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
21902190
EnableDefaultHealthCheckService(true);
21912191
// Start server.
21922192
const int kNumServers = 1;
@@ -2233,7 +2233,7 @@ TEST_F(RoundRobinTest, WithHealthCheckingInhibitPerChannel) {
22332233
}
22342234

22352235
TEST_F(RoundRobinTest, HealthCheckingServiceNamePerChannel) {
2236-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2236+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
22372237
EnableDefaultHealthCheckService(true);
22382238
// Start server.
22392239
const int kNumServers = 1;
@@ -2287,7 +2287,7 @@ TEST_F(RoundRobinTest, HealthCheckingServiceNamePerChannel) {
22872287

22882288
TEST_F(RoundRobinTest,
22892289
HealthCheckingServiceNameChangesAfterSubchannelsCreated) {
2290-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2290+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
22912291
EnableDefaultHealthCheckService(true);
22922292
// Start server.
22932293
const int kNumServers = 1;
@@ -2315,7 +2315,7 @@ TEST_F(RoundRobinTest,
23152315
}
23162316

23172317
TEST_F(RoundRobinTest, HealthCheckingRetryOnStreamEnd) {
2318-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2318+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
23192319
// Start servers.
23202320
const int kNumServers = 2;
23212321
CreateServers(kNumServers);
@@ -2627,7 +2627,7 @@ ClientLbInterceptTrailingMetadataTest*
26272627
ClientLbInterceptTrailingMetadataTest::current_test_instance_ = nullptr;
26282628

26292629
TEST_F(ClientLbInterceptTrailingMetadataTest, StatusOk) {
2630-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2630+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
26312631
StartServers(1);
26322632
FakeResolverResponseGeneratorWrapper response_generator;
26332633
auto channel =
@@ -2644,7 +2644,7 @@ TEST_F(ClientLbInterceptTrailingMetadataTest, StatusOk) {
26442644
}
26452645

26462646
TEST_F(ClientLbInterceptTrailingMetadataTest, StatusFailed) {
2647-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2647+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
26482648
StartServers(1);
26492649
FakeResolverResponseGeneratorWrapper response_generator;
26502650
auto channel =
@@ -2666,7 +2666,7 @@ TEST_F(ClientLbInterceptTrailingMetadataTest, StatusFailed) {
26662666

26672667
TEST_F(ClientLbInterceptTrailingMetadataTest,
26682668
StatusCancelledWithoutStartingRecvTrailingMetadata) {
2669-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2669+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
26702670
StartServers(1);
26712671
FakeResolverResponseGeneratorWrapper response_generator;
26722672
auto channel =
@@ -2690,7 +2690,7 @@ TEST_F(ClientLbInterceptTrailingMetadataTest,
26902690
}
26912691

26922692
TEST_F(ClientLbInterceptTrailingMetadataTest, InterceptsRetriesDisabled) {
2693-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2693+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
26942694
const int kNumServers = 1;
26952695
const int kNumRpcs = 10;
26962696
StartServers(kNumServers);
@@ -2719,7 +2719,7 @@ TEST_F(ClientLbInterceptTrailingMetadataTest, InterceptsRetriesDisabled) {
27192719
}
27202720

27212721
TEST_F(ClientLbInterceptTrailingMetadataTest, InterceptsRetriesEnabled) {
2722-
SKIP_RETRY_TEST_FOR_PH2(
2722+
SKIP_RETRY_TEST_FOR_PH2_CLIENT(
27232723
"TODO (tjagtap) [PH2][P5][Retry] Test with Retry-PH2 feature");
27242724
const int kNumServers = 1;
27252725
const int kNumRpcs = 10;
@@ -2763,7 +2763,7 @@ TEST_F(ClientLbInterceptTrailingMetadataTest, InterceptsRetriesEnabled) {
27632763
}
27642764

27652765
TEST_F(ClientLbInterceptTrailingMetadataTest, Valid) {
2766-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2766+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
27672767
RunPerRpcMetricReportingTest(OrcaLoadReportBuilder()
27682768
.SetApplicationUtilization(0.25)
27692769
.SetCpuUtilization(0.5)
@@ -2793,7 +2793,7 @@ TEST_F(ClientLbInterceptTrailingMetadataTest, Valid) {
27932793
}
27942794

27952795
TEST_F(ClientLbInterceptTrailingMetadataTest, NegativeValues) {
2796-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2796+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
27972797
RunPerRpcMetricReportingTest(OrcaLoadReportBuilder()
27982798
.SetApplicationUtilization(-0.3)
27992799
.SetCpuUtilization(-0.1)
@@ -2811,7 +2811,7 @@ TEST_F(ClientLbInterceptTrailingMetadataTest, NegativeValues) {
28112811
}
28122812

28132813
TEST_F(ClientLbInterceptTrailingMetadataTest, AboveOneUtilization) {
2814-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2814+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
28152815
RunPerRpcMetricReportingTest(OrcaLoadReportBuilder()
28162816
.SetApplicationUtilization(1.9)
28172817
.SetCpuUtilization(1.1)
@@ -2829,7 +2829,7 @@ TEST_F(ClientLbInterceptTrailingMetadataTest, AboveOneUtilization) {
28292829
}
28302830

28312831
TEST_F(ClientLbInterceptTrailingMetadataTest, BackendMetricDataMerge) {
2832-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
2832+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
28332833
const int kNumServers = 1;
28342834
const int kNumRpcs = 10;
28352835
StartServers(kNumServers);
@@ -3053,7 +3053,7 @@ class OobBackendMetricTest : public ClientLbEnd2endTest {
30533053
OobBackendMetricTest* OobBackendMetricTest::current_test_instance_ = nullptr;
30543054

30553055
TEST_F(OobBackendMetricTest, Basic) {
3056-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
3056+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
30573057
StartServers(1);
30583058
// Set initial backend metric data on server.
30593059
constexpr char kMetricName[] = "foo";
@@ -3299,7 +3299,7 @@ class WeightedRoundRobinTest : public ClientLbEnd2endTest {
32993299
};
33003300

33013301
TEST_F(WeightedRoundRobinTest, CallAndServerMetric) {
3302-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
3302+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
33033303
const int kNumServers = 3;
33043304
StartServers(kNumServers);
33053305
// Report server metrics that should give 6:4:3 WRR picks.
@@ -3344,7 +3344,7 @@ TEST_F(WeightedRoundRobinTest, CallAndServerMetric) {
33443344
// all of its subchannels every time it saw an update, thus causing the
33453345
// WRR policy to re-enter the blackout period for that address.
33463346
TEST_F(WeightedRoundRobinTest, WithOutlierDetection) {
3347-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
3347+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
33483348
const int kBlackoutPeriodSeconds = 10;
33493349
const int kNumServers = 3;
33503350
StartServers(kNumServers);
@@ -3409,7 +3409,7 @@ INSTANTIATE_TEST_SUITE_P(WeightedRoundRobin, WeightedRoundRobinParamTest,
34093409
kServiceConfigOob));
34103410

34113411
TEST_P(WeightedRoundRobinParamTest, Basic) {
3412-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
3412+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
34133413
const int kNumServers = 3;
34143414
StartServers(kNumServers);
34153415
// Report server metrics that should give 1:2:4 WRR picks.
@@ -3513,7 +3513,7 @@ class ConnectionScalingTest : public ClientLbEnd2endTest {
35133513
// ResourceQuota changes land)
35143514

35153515
TEST_F(ConnectionScalingTest, SingleConnection) {
3516-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
3516+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
35173517
const int kMaxConcurrentStreams = 3;
35183518
// Start a server with MAX_CONCURRENT_STREAMS set.
35193519
StartServers(1, {}, nullptr,

‎test/cpp/end2end/end2end_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,7 @@ TEST_P(End2endTest, BinaryTrailerTest) {
14841484
}
14851485

14861486
TEST_P(End2endTest, ExpectErrorTest) {
1487-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
1487+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
14881488

14891489
ResetStub();
14901490

@@ -1565,7 +1565,7 @@ TEST_P(ProxyEnd2endTest, MultipleRpcs) {
15651565

15661566
// Set a 10us deadline and make sure proper error is returned.
15671567
TEST_P(ProxyEnd2endTest, RpcDeadlineExpires) {
1568-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix flake");
1568+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix flake");
15691569
ResetStub();
15701570
EchoRequest request;
15711571
EchoResponse response;
@@ -1607,7 +1607,7 @@ TEST_P(ProxyEnd2endTest, RpcLongDeadline) {
16071607

16081608
// Ask server to echo back the deadline it sees.
16091609
TEST_P(ProxyEnd2endTest, EchoDeadline) {
1610-
SKIP_TEST_FOR_PH2("TODO(tjagtap) [PH2][P3][Client] Fix bug");
1610+
SKIP_TEST_FOR_PH2_CLIENT("TODO(tjagtap) [PH2][P3][Client] Fix bug");
16111611
ResetStub();
16121612
EchoRequest request;
16131613
EchoResponse response;

‎test/cpp/end2end/end2end_test_utils.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,17 @@ inline void ApplyCommonChannelArguments(ChannelArguments& args) {
6767
}
6868
}
6969

70-
#define SKIP_TEST_FOR_PH2(message) \
70+
#define SKIP_TEST_FOR_PH2_CLIENT(message) \
7171
if (grpc_core::IsPromiseBasedHttp2ClientTransportEnabled()) \
7272
GTEST_SKIP() << (message);
7373

74+
#define SKIP_TEST_FOR_PH2_SERVER(message) \
75+
if (grpc_core::IsPromiseBasedHttp2ServerTransportEnabled()) \
76+
GTEST_SKIP() << (message);
77+
7478
// Retry for PH2 will be implemented separately, after the PH2 Client and Server
7579
// rollout starts.
76-
#define SKIP_RETRY_TEST_FOR_PH2(message) \
80+
#define SKIP_RETRY_TEST_FOR_PH2_CLIENT(message) \
7781
if (grpc_core::IsPromiseBasedHttp2ClientTransportEnabled()) \
7882
GTEST_SKIP() << (message);
7983

0 commit comments

Comments
 (0)