Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #23430 from vjpai/remove_do_not_test

Browse Source 
Remove references to skipping callback API tests
pull/23440/head
Vijay Pai 4 years ago committed by GitHub
parent 6dc44b33c7 e1a45fb237
commit 08d737abf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 177 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      test/cpp/end2end/client_callback_end2end_test.cc
  2. 86
      test/cpp/end2end/end2end_test.cc
  3. 33
      test/cpp/end2end/message_allocator_end2end_test.cc

62
test/cpp/end2end/client_callback_end2end_test.cc
Unescape View File

@ -45,17 +45,6 @@
#include "test/cpp/util/string_ref_helper.h" #include "test/cpp/util/string_ref_helper.h"
#include "test/cpp/util/test_credentials_provider.h" #include "test/cpp/util/test_credentials_provider.h"
// MAYBE_SKIP_TEST is a macro to determine if this particular test configuration
// should be skipped based on a decision made at SetUp time. In particular, any
// callback tests can only be run if the iomgr can run in the background or if
// the transport is in-process.
#define MAYBE_SKIP_TEST \
do { \
if (do_not_test_) { \
return; \
} \
} while (0)
namespace grpc { namespace grpc {
namespace testing { namespace testing {
namespace { namespace {
@ -130,10 +119,6 @@ class ClientCallbackEnd2endTest
server_ = builder.BuildAndStart(); server_ = builder.BuildAndStart();
is_server_started_ = true; is_server_started_ = true;
// if (GetParam().protocol == Protocol::TCP &&
// !grpc_iomgr_run_in_background()) {
// do_not_test_ = true;
// }
} }
void ResetStub() { void ResetStub() {
@ -367,7 +352,6 @@ class ClientCallbackEnd2endTest
rpc.Await(); rpc.Await();
} }
} }
bool do_not_test_{false};
bool is_server_started_{false}; bool is_server_started_{false};
int picked_port_{0}; int picked_port_{0};
std::shared_ptr<Channel> channel_; std::shared_ptr<Channel> channel_;
@ -380,13 +364,11 @@ class ClientCallbackEnd2endTest
}; };
TEST_P(ClientCallbackEnd2endTest, SimpleRpc) { TEST_P(ClientCallbackEnd2endTest, SimpleRpc) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendRpcs(1, false); SendRpcs(1, false);
} }
TEST_P(ClientCallbackEnd2endTest, SimpleRpcExpectedError) { TEST_P(ClientCallbackEnd2endTest, SimpleRpcExpectedError) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
@ -421,7 +403,6 @@ TEST_P(ClientCallbackEnd2endTest, SimpleRpcExpectedError) {
} }
TEST_P(ClientCallbackEnd2endTest, SimpleRpcUnderLockNested) { TEST_P(ClientCallbackEnd2endTest, SimpleRpcUnderLockNested) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
std::mutex mu1, mu2, mu3; std::mutex mu1, mu2, mu3;
std::condition_variable cv; std::condition_variable cv;
@ -472,7 +453,6 @@ TEST_P(ClientCallbackEnd2endTest, SimpleRpcUnderLockNested) {
} }
TEST_P(ClientCallbackEnd2endTest, SimpleRpcUnderLock) { TEST_P(ClientCallbackEnd2endTest, SimpleRpcUnderLock) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
std::mutex mu; std::mutex mu;
std::condition_variable cv; std::condition_variable cv;
@ -500,19 +480,16 @@ TEST_P(ClientCallbackEnd2endTest, SimpleRpcUnderLock) {
} }
TEST_P(ClientCallbackEnd2endTest, SequentialRpcs) { TEST_P(ClientCallbackEnd2endTest, SequentialRpcs) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendRpcs(10, false); SendRpcs(10, false);
} }
TEST_P(ClientCallbackEnd2endTest, SequentialRpcsRawReq) { TEST_P(ClientCallbackEnd2endTest, SequentialRpcsRawReq) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendRpcsRawReq(10); SendRpcsRawReq(10);
} }
TEST_P(ClientCallbackEnd2endTest, SendClientInitialMetadata) { TEST_P(ClientCallbackEnd2endTest, SendClientInitialMetadata) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SimpleRequest request; SimpleRequest request;
SimpleResponse response; SimpleResponse response;
@ -539,51 +516,43 @@ TEST_P(ClientCallbackEnd2endTest, SendClientInitialMetadata) {
} }
TEST_P(ClientCallbackEnd2endTest, SimpleRpcWithBinaryMetadata) { TEST_P(ClientCallbackEnd2endTest, SimpleRpcWithBinaryMetadata) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendRpcs(1, true); SendRpcs(1, true);
} }
TEST_P(ClientCallbackEnd2endTest, SequentialRpcsWithVariedBinaryMetadataValue) { TEST_P(ClientCallbackEnd2endTest, SequentialRpcsWithVariedBinaryMetadataValue) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendRpcs(10, true); SendRpcs(10, true);
} }
TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcs) { TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcs) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendRpcsGeneric(10, false); SendRpcsGeneric(10, false);
} }
TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcsAsBidi) { TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcsAsBidi) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendGenericEchoAsBidi(10, 1, /*do_writes_done=*/true); SendGenericEchoAsBidi(10, 1, /*do_writes_done=*/true);
} }
TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcsAsBidiWithReactorReuse) { TEST_P(ClientCallbackEnd2endTest, SequentialGenericRpcsAsBidiWithReactorReuse) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendGenericEchoAsBidi(10, 10, /*do_writes_done=*/true); SendGenericEchoAsBidi(10, 10, /*do_writes_done=*/true);
} }
TEST_P(ClientCallbackEnd2endTest, GenericRpcNoWritesDone) { TEST_P(ClientCallbackEnd2endTest, GenericRpcNoWritesDone) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendGenericEchoAsBidi(1, 1, /*do_writes_done=*/false); SendGenericEchoAsBidi(1, 1, /*do_writes_done=*/false);
} }
#if GRPC_ALLOW_EXCEPTIONS #if GRPC_ALLOW_EXCEPTIONS
TEST_P(ClientCallbackEnd2endTest, ExceptingRpc) { TEST_P(ClientCallbackEnd2endTest, ExceptingRpc) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendRpcsGeneric(10, true); SendRpcsGeneric(10, true);
} }
#endif #endif
TEST_P(ClientCallbackEnd2endTest, MultipleRpcsWithVariedBinaryMetadataValue) { TEST_P(ClientCallbackEnd2endTest, MultipleRpcsWithVariedBinaryMetadataValue) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
std::vector<std::thread> threads; std::vector<std::thread> threads;
threads.reserve(10); threads.reserve(10);
@ -596,7 +565,6 @@ TEST_P(ClientCallbackEnd2endTest, MultipleRpcsWithVariedBinaryMetadataValue) {
} }
TEST_P(ClientCallbackEnd2endTest, MultipleRpcs) { TEST_P(ClientCallbackEnd2endTest, MultipleRpcs) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
std::vector<std::thread> threads; std::vector<std::thread> threads;
threads.reserve(10); threads.reserve(10);
@ -609,7 +577,6 @@ TEST_P(ClientCallbackEnd2endTest, MultipleRpcs) {
} }
TEST_P(ClientCallbackEnd2endTest, CancelRpcBeforeStart) { TEST_P(ClientCallbackEnd2endTest, CancelRpcBeforeStart) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -638,7 +605,6 @@ TEST_P(ClientCallbackEnd2endTest, CancelRpcBeforeStart) {
} }
TEST_P(ClientCallbackEnd2endTest, RequestEchoServerCancel) { TEST_P(ClientCallbackEnd2endTest, RequestEchoServerCancel) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -769,7 +735,6 @@ class WriteClient : public grpc::experimental::ClientWriteReactor<EchoRequest> {
}; };
TEST_P(ClientCallbackEnd2endTest, RequestStream) { TEST_P(ClientCallbackEnd2endTest, RequestStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
WriteClient test{stub_.get(), DO_NOT_CANCEL, 3}; WriteClient test{stub_.get(), DO_NOT_CANCEL, 3};
test.Await(); test.Await();
@ -780,7 +745,6 @@ TEST_P(ClientCallbackEnd2endTest, RequestStream) {
} }
TEST_P(ClientCallbackEnd2endTest, ClientCancelsRequestStream) { TEST_P(ClientCallbackEnd2endTest, ClientCancelsRequestStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
WriteClient test{stub_.get(), DO_NOT_CANCEL, 3, ClientCancelInfo{2}}; WriteClient test{stub_.get(), DO_NOT_CANCEL, 3, ClientCancelInfo{2}};
test.Await(); test.Await();
@ -792,7 +756,6 @@ TEST_P(ClientCallbackEnd2endTest, ClientCancelsRequestStream) {
// Server to cancel before doing reading the request // Server to cancel before doing reading the request
TEST_P(ClientCallbackEnd2endTest, RequestStreamServerCancelBeforeReads) { TEST_P(ClientCallbackEnd2endTest, RequestStreamServerCancelBeforeReads) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
WriteClient test{stub_.get(), CANCEL_BEFORE_PROCESSING, 1}; WriteClient test{stub_.get(), CANCEL_BEFORE_PROCESSING, 1};
test.Await(); test.Await();
@ -804,7 +767,6 @@ TEST_P(ClientCallbackEnd2endTest, RequestStreamServerCancelBeforeReads) {
// Server to cancel while reading a request from the stream in parallel // Server to cancel while reading a request from the stream in parallel
TEST_P(ClientCallbackEnd2endTest, RequestStreamServerCancelDuringRead) { TEST_P(ClientCallbackEnd2endTest, RequestStreamServerCancelDuringRead) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
WriteClient test{stub_.get(), CANCEL_DURING_PROCESSING, 10}; WriteClient test{stub_.get(), CANCEL_DURING_PROCESSING, 10};
test.Await(); test.Await();
@ -817,7 +779,6 @@ TEST_P(ClientCallbackEnd2endTest, RequestStreamServerCancelDuringRead) {
// Server to cancel after reading all the requests but before returning to the // Server to cancel after reading all the requests but before returning to the
// client // client
TEST_P(ClientCallbackEnd2endTest, RequestStreamServerCancelAfterReads) { TEST_P(ClientCallbackEnd2endTest, RequestStreamServerCancelAfterReads) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
WriteClient test{stub_.get(), CANCEL_AFTER_PROCESSING, 4}; WriteClient test{stub_.get(), CANCEL_AFTER_PROCESSING, 4};
test.Await(); test.Await();
@ -828,7 +789,6 @@ TEST_P(ClientCallbackEnd2endTest, RequestStreamServerCancelAfterReads) {
} }
TEST_P(ClientCallbackEnd2endTest, UnaryReactor) { TEST_P(ClientCallbackEnd2endTest, UnaryReactor) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
class UnaryClient : public grpc::experimental::ClientUnaryReactor { class UnaryClient : public grpc::experimental::ClientUnaryReactor {
public: public:
@ -887,7 +847,6 @@ TEST_P(ClientCallbackEnd2endTest, UnaryReactor) {
} }
TEST_P(ClientCallbackEnd2endTest, GenericUnaryReactor) { TEST_P(ClientCallbackEnd2endTest, GenericUnaryReactor) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
const std::string kMethodName("/grpc.testing.EchoTestService/Echo"); const std::string kMethodName("/grpc.testing.EchoTestService/Echo");
class UnaryClient : public grpc::experimental::ClientUnaryReactor { class UnaryClient : public grpc::experimental::ClientUnaryReactor {
@ -1053,7 +1012,6 @@ class ReadClient : public grpc::experimental::ClientReadReactor<EchoResponse> {
}; };
TEST_P(ClientCallbackEnd2endTest, ResponseStream) { TEST_P(ClientCallbackEnd2endTest, ResponseStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
ReadClient test{stub_.get(), DO_NOT_CANCEL}; ReadClient test{stub_.get(), DO_NOT_CANCEL};
test.Await(); test.Await();
@ -1064,7 +1022,6 @@ TEST_P(ClientCallbackEnd2endTest, ResponseStream) {
} }
TEST_P(ClientCallbackEnd2endTest, ClientCancelsResponseStream) { TEST_P(ClientCallbackEnd2endTest, ClientCancelsResponseStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
ReadClient test{stub_.get(), DO_NOT_CANCEL, ClientCancelInfo{2}}; ReadClient test{stub_.get(), DO_NOT_CANCEL, ClientCancelInfo{2}};
test.Await(); test.Await();
@ -1074,7 +1031,6 @@ TEST_P(ClientCallbackEnd2endTest, ClientCancelsResponseStream) {
// Server to cancel before sending any response messages // Server to cancel before sending any response messages
TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelBefore) { TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelBefore) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
ReadClient test{stub_.get(), CANCEL_BEFORE_PROCESSING}; ReadClient test{stub_.get(), CANCEL_BEFORE_PROCESSING};
test.Await(); test.Await();
@ -1086,7 +1042,6 @@ TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelBefore) {
// Server to cancel while writing a response to the stream in parallel // Server to cancel while writing a response to the stream in parallel
TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelDuring) { TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelDuring) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
ReadClient test{stub_.get(), CANCEL_DURING_PROCESSING}; ReadClient test{stub_.get(), CANCEL_DURING_PROCESSING};
test.Await(); test.Await();
@ -1099,7 +1054,6 @@ TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelDuring) {
// Server to cancel after writing all the respones to the stream but before // Server to cancel after writing all the respones to the stream but before
// returning to the client // returning to the client
TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelAfter) { TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelAfter) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
ReadClient test{stub_.get(), CANCEL_AFTER_PROCESSING}; ReadClient test{stub_.get(), CANCEL_AFTER_PROCESSING};
test.Await(); test.Await();
@ -1264,7 +1218,6 @@ class BidiClient
}; };
TEST_P(ClientCallbackEnd2endTest, BidiStream) { TEST_P(ClientCallbackEnd2endTest, BidiStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
BidiClient test(stub_.get(), DO_NOT_CANCEL, BidiClient test(stub_.get(), DO_NOT_CANCEL,
kServerDefaultResponseStreamsToSend, kServerDefaultResponseStreamsToSend,
@ -1277,7 +1230,6 @@ TEST_P(ClientCallbackEnd2endTest, BidiStream) {
} }
TEST_P(ClientCallbackEnd2endTest, BidiStreamFirstWriteAsync) { TEST_P(ClientCallbackEnd2endTest, BidiStreamFirstWriteAsync) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
BidiClient test(stub_.get(), DO_NOT_CANCEL, BidiClient test(stub_.get(), DO_NOT_CANCEL,
kServerDefaultResponseStreamsToSend, kServerDefaultResponseStreamsToSend,
@ -1290,7 +1242,6 @@ TEST_P(ClientCallbackEnd2endTest, BidiStreamFirstWriteAsync) {
} }
TEST_P(ClientCallbackEnd2endTest, BidiStreamCorked) { TEST_P(ClientCallbackEnd2endTest, BidiStreamCorked) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
BidiClient test(stub_.get(), DO_NOT_CANCEL, BidiClient test(stub_.get(), DO_NOT_CANCEL,
kServerDefaultResponseStreamsToSend, kServerDefaultResponseStreamsToSend,
@ -1303,7 +1254,6 @@ TEST_P(ClientCallbackEnd2endTest, BidiStreamCorked) {
} }
TEST_P(ClientCallbackEnd2endTest, BidiStreamCorkedFirstWriteAsync) { TEST_P(ClientCallbackEnd2endTest, BidiStreamCorkedFirstWriteAsync) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
BidiClient test(stub_.get(), DO_NOT_CANCEL, BidiClient test(stub_.get(), DO_NOT_CANCEL,
kServerDefaultResponseStreamsToSend, kServerDefaultResponseStreamsToSend,
@ -1316,7 +1266,6 @@ TEST_P(ClientCallbackEnd2endTest, BidiStreamCorkedFirstWriteAsync) {
} }
TEST_P(ClientCallbackEnd2endTest, ClientCancelsBidiStream) { TEST_P(ClientCallbackEnd2endTest, ClientCancelsBidiStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
BidiClient test(stub_.get(), DO_NOT_CANCEL, BidiClient test(stub_.get(), DO_NOT_CANCEL,
kServerDefaultResponseStreamsToSend, kServerDefaultResponseStreamsToSend,
@ -1331,7 +1280,6 @@ TEST_P(ClientCallbackEnd2endTest, ClientCancelsBidiStream) {
// Server to cancel before reading/writing any requests/responses on the stream // Server to cancel before reading/writing any requests/responses on the stream
TEST_P(ClientCallbackEnd2endTest, BidiStreamServerCancelBefore) { TEST_P(ClientCallbackEnd2endTest, BidiStreamServerCancelBefore) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
BidiClient test(stub_.get(), CANCEL_BEFORE_PROCESSING, /*num_msgs_to_send=*/2, BidiClient test(stub_.get(), CANCEL_BEFORE_PROCESSING, /*num_msgs_to_send=*/2,
/*cork_metadata=*/false, /*first_write_async=*/false); /*cork_metadata=*/false, /*first_write_async=*/false);
@ -1345,7 +1293,6 @@ TEST_P(ClientCallbackEnd2endTest, BidiStreamServerCancelBefore) {
// Server to cancel while reading/writing requests/responses on the stream in // Server to cancel while reading/writing requests/responses on the stream in
// parallel // parallel
TEST_P(ClientCallbackEnd2endTest, BidiStreamServerCancelDuring) { TEST_P(ClientCallbackEnd2endTest, BidiStreamServerCancelDuring) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
BidiClient test(stub_.get(), CANCEL_DURING_PROCESSING, BidiClient test(stub_.get(), CANCEL_DURING_PROCESSING,
/*num_msgs_to_send=*/10, /*cork_metadata=*/false, /*num_msgs_to_send=*/10, /*cork_metadata=*/false,
@ -1360,7 +1307,6 @@ TEST_P(ClientCallbackEnd2endTest, BidiStreamServerCancelDuring) {
// Server to cancel after reading/writing all requests/responses on the stream // Server to cancel after reading/writing all requests/responses on the stream
// but before returning to the client // but before returning to the client
TEST_P(ClientCallbackEnd2endTest, BidiStreamServerCancelAfter) { TEST_P(ClientCallbackEnd2endTest, BidiStreamServerCancelAfter) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
BidiClient test(stub_.get(), CANCEL_AFTER_PROCESSING, /*num_msgs_to_send=*/5, BidiClient test(stub_.get(), CANCEL_AFTER_PROCESSING, /*num_msgs_to_send=*/5,
/*cork_metadata=*/false, /*first_write_async=*/false); /*cork_metadata=*/false, /*first_write_async=*/false);
@ -1372,7 +1318,6 @@ TEST_P(ClientCallbackEnd2endTest, BidiStreamServerCancelAfter) {
} }
TEST_P(ClientCallbackEnd2endTest, SimultaneousReadAndWritesDone) { TEST_P(ClientCallbackEnd2endTest, SimultaneousReadAndWritesDone) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
class Client : public grpc::experimental::ClientBidiReactor<EchoRequest, class Client : public grpc::experimental::ClientBidiReactor<EchoRequest,
EchoResponse> { EchoResponse> {
@ -1420,7 +1365,6 @@ TEST_P(ClientCallbackEnd2endTest, SimultaneousReadAndWritesDone) {
} }
TEST_P(ClientCallbackEnd2endTest, UnimplementedRpc) { TEST_P(ClientCallbackEnd2endTest, UnimplementedRpc) {
MAYBE_SKIP_TEST;
ChannelArguments args; ChannelArguments args;
const auto& channel_creds = GetCredentialsProvider()->GetChannelCredentials( const auto& channel_creds = GetCredentialsProvider()->GetChannelCredentials(
GetParam().credentials_type, &args); GetParam().credentials_type, &args);
@ -1455,7 +1399,6 @@ TEST_P(ClientCallbackEnd2endTest, UnimplementedRpc) {
TEST_P(ClientCallbackEnd2endTest, TEST_P(ClientCallbackEnd2endTest,
ResponseStreamExtraReactionFlowReadsUntilDone) { ResponseStreamExtraReactionFlowReadsUntilDone) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
class ReadAllIncomingDataClient class ReadAllIncomingDataClient
: public grpc::experimental::ClientReadReactor<EchoResponse> { : public grpc::experimental::ClientReadReactor<EchoResponse> {
@ -1584,8 +1527,5 @@ INSTANTIATE_TEST_SUITE_P(ClientCallbackEnd2endTest, ClientCallbackEnd2endTest,
int main(int argc, char** argv) { int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
grpc::testing::TestEnvironment env(argc, argv); grpc::testing::TestEnvironment env(argc, argv);
grpc_init(); return RUN_ALL_TESTS();
int ret = RUN_ALL_TESTS();
grpc_shutdown();
return ret;
} }

86
test/cpp/end2end/end2end_test.cc
Unescape View File

@ -62,17 +62,6 @@ using grpc::testing::EchoResponse;
using grpc::testing::kTlsCredentialsType; using grpc::testing::kTlsCredentialsType;
using std::chrono::system_clock; using std::chrono::system_clock;
// MAYBE_SKIP_TEST is a macro to determine if this particular test configuration
// should be skipped based on a decision made at SetUp time. In particular,
// tests that use the callback server can only be run if the iomgr can run in
// the background or if the transport is in-process.
#define MAYBE_SKIP_TEST \
do { \
if (do_not_test_) { \
return; \
} \
} while (0)
namespace grpc { namespace grpc {
namespace testing { namespace testing {
namespace { namespace {
@ -327,14 +316,6 @@ class End2endTest : public ::testing::TestWithParam<TestScenario> {
GetParam().Log(); GetParam().Log();
} }
void SetUp() override {
// if (GetParam().callback_server && !GetParam().inproc &&
// !grpc_iomgr_run_in_background()) {
// do_not_test_ = true;
// return;
// }
}
void TearDown() override { void TearDown() override {
if (is_server_started_) { if (is_server_started_) {
server_->Shutdown(); server_->Shutdown();
@ -469,7 +450,6 @@ class End2endTest : public ::testing::TestWithParam<TestScenario> {
DummyInterceptor::Reset(); DummyInterceptor::Reset();
} }
bool do_not_test_{false};
bool is_server_started_; bool is_server_started_;
std::shared_ptr<Channel> channel_; std::shared_ptr<Channel> channel_;
std::unique_ptr<grpc::testing::EchoTestService::Stub> stub_; std::unique_ptr<grpc::testing::EchoTestService::Stub> stub_;
@ -525,7 +505,6 @@ class End2endServerTryCancelTest : public End2endTest {
// NOTE: Do not call this function with server_try_cancel == DO_NOT_CANCEL. // NOTE: Do not call this function with server_try_cancel == DO_NOT_CANCEL.
void TestRequestStreamServerCancel( void TestRequestStreamServerCancel(
ServerTryCancelRequestPhase server_try_cancel, int num_msgs_to_send) { ServerTryCancelRequestPhase server_try_cancel, int num_msgs_to_send) {
MAYBE_SKIP_TEST;
RestartServer(std::shared_ptr<AuthMetadataProcessor>()); RestartServer(std::shared_ptr<AuthMetadataProcessor>());
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
@ -604,7 +583,6 @@ class End2endServerTryCancelTest : public End2endTest {
// NOTE: Do not call this function with server_try_cancel == DO_NOT_CANCEL. // NOTE: Do not call this function with server_try_cancel == DO_NOT_CANCEL.
void TestResponseStreamServerCancel( void TestResponseStreamServerCancel(
ServerTryCancelRequestPhase server_try_cancel) { ServerTryCancelRequestPhase server_try_cancel) {
MAYBE_SKIP_TEST;
RestartServer(std::shared_ptr<AuthMetadataProcessor>()); RestartServer(std::shared_ptr<AuthMetadataProcessor>());
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
@ -686,7 +664,6 @@ class End2endServerTryCancelTest : public End2endTest {
// NOTE: Do not call this function with server_try_cancel == DO_NOT_CANCEL. // NOTE: Do not call this function with server_try_cancel == DO_NOT_CANCEL.
void TestBidiStreamServerCancel(ServerTryCancelRequestPhase server_try_cancel, void TestBidiStreamServerCancel(ServerTryCancelRequestPhase server_try_cancel,
int num_messages) { int num_messages) {
MAYBE_SKIP_TEST;
RestartServer(std::shared_ptr<AuthMetadataProcessor>()); RestartServer(std::shared_ptr<AuthMetadataProcessor>());
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
@ -762,7 +739,6 @@ class End2endServerTryCancelTest : public End2endTest {
}; };
TEST_P(End2endServerTryCancelTest, RequestEchoServerCancel) { TEST_P(End2endServerTryCancelTest, RequestEchoServerCancel) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -825,7 +801,6 @@ TEST_P(End2endServerTryCancelTest, BidiStreamServerCancelAfter) {
} }
TEST_P(End2endTest, SimpleRpcWithCustomUserAgentPrefix) { TEST_P(End2endTest, SimpleRpcWithCustomUserAgentPrefix) {
MAYBE_SKIP_TEST;
// User-Agent is an HTTP header for HTTP transports only // User-Agent is an HTTP header for HTTP transports only
if (GetParam().inproc) { if (GetParam().inproc) {
return; return;
@ -849,7 +824,6 @@ TEST_P(End2endTest, SimpleRpcWithCustomUserAgentPrefix) {
} }
TEST_P(End2endTest, MultipleRpcsWithVariedBinaryMetadataValue) { TEST_P(End2endTest, MultipleRpcsWithVariedBinaryMetadataValue) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
std::vector<std::thread> threads; std::vector<std::thread> threads;
threads.reserve(10); threads.reserve(10);
@ -862,7 +836,6 @@ TEST_P(End2endTest, MultipleRpcsWithVariedBinaryMetadataValue) {
} }
TEST_P(End2endTest, MultipleRpcs) { TEST_P(End2endTest, MultipleRpcs) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
std::vector<std::thread> threads; std::vector<std::thread> threads;
threads.reserve(10); threads.reserve(10);
@ -875,7 +848,6 @@ TEST_P(End2endTest, MultipleRpcs) {
} }
TEST_P(End2endTest, ManyStubs) { TEST_P(End2endTest, ManyStubs) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
ChannelTestPeer peer(channel_.get()); ChannelTestPeer peer(channel_.get());
int registered_calls_pre = peer.registered_calls(); int registered_calls_pre = peer.registered_calls();
@ -888,7 +860,6 @@ TEST_P(End2endTest, ManyStubs) {
} }
TEST_P(End2endTest, EmptyBinaryMetadata) { TEST_P(End2endTest, EmptyBinaryMetadata) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -901,7 +872,6 @@ TEST_P(End2endTest, EmptyBinaryMetadata) {
} }
TEST_P(End2endTest, ReconnectChannel) { TEST_P(End2endTest, ReconnectChannel) {
MAYBE_SKIP_TEST;
if (GetParam().inproc) { if (GetParam().inproc) {
return; return;
} }
@ -929,7 +899,6 @@ TEST_P(End2endTest, ReconnectChannel) {
} }
TEST_P(End2endTest, RequestStreamOneRequest) { TEST_P(End2endTest, RequestStreamOneRequest) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -946,7 +915,6 @@ TEST_P(End2endTest, RequestStreamOneRequest) {
} }
TEST_P(End2endTest, RequestStreamOneRequestWithCoalescingApi) { TEST_P(End2endTest, RequestStreamOneRequestWithCoalescingApi) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -962,7 +930,6 @@ TEST_P(End2endTest, RequestStreamOneRequestWithCoalescingApi) {
} }
TEST_P(End2endTest, RequestStreamTwoRequests) { TEST_P(End2endTest, RequestStreamTwoRequests) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -979,7 +946,6 @@ TEST_P(End2endTest, RequestStreamTwoRequests) {
} }
TEST_P(End2endTest, RequestStreamTwoRequestsWithWriteThrough) { TEST_P(End2endTest, RequestStreamTwoRequestsWithWriteThrough) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -996,7 +962,6 @@ TEST_P(End2endTest, RequestStreamTwoRequestsWithWriteThrough) {
} }
TEST_P(End2endTest, RequestStreamTwoRequestsWithCoalescingApi) { TEST_P(End2endTest, RequestStreamTwoRequestsWithCoalescingApi) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1013,7 +978,6 @@ TEST_P(End2endTest, RequestStreamTwoRequestsWithCoalescingApi) {
} }
TEST_P(End2endTest, ResponseStream) { TEST_P(End2endTest, ResponseStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1032,7 +996,6 @@ TEST_P(End2endTest, ResponseStream) {
} }
TEST_P(End2endTest, ResponseStreamWithCoalescingApi) { TEST_P(End2endTest, ResponseStreamWithCoalescingApi) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1054,7 +1017,6 @@ TEST_P(End2endTest, ResponseStreamWithCoalescingApi) {
// This was added to prevent regression from issue: // This was added to prevent regression from issue:
// https://github.com/grpc/grpc/issues/11546 // https://github.com/grpc/grpc/issues/11546
TEST_P(End2endTest, ResponseStreamWithEverythingCoalesced) { TEST_P(End2endTest, ResponseStreamWithEverythingCoalesced) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1076,7 +1038,6 @@ TEST_P(End2endTest, ResponseStreamWithEverythingCoalesced) {
} }
TEST_P(End2endTest, BidiStream) { TEST_P(End2endTest, BidiStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1101,7 +1062,6 @@ TEST_P(End2endTest, BidiStream) {
} }
TEST_P(End2endTest, BidiStreamWithCoalescingApi) { TEST_P(End2endTest, BidiStreamWithCoalescingApi) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1137,7 +1097,6 @@ TEST_P(End2endTest, BidiStreamWithCoalescingApi) {
// This was added to prevent regression from issue: // This was added to prevent regression from issue:
// https://github.com/grpc/grpc/issues/11546 // https://github.com/grpc/grpc/issues/11546
TEST_P(End2endTest, BidiStreamWithEverythingCoalesced) { TEST_P(End2endTest, BidiStreamWithEverythingCoalesced) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1163,7 +1122,6 @@ TEST_P(End2endTest, BidiStreamWithEverythingCoalesced) {
// Talk to the two services with the same name but different package names. // Talk to the two services with the same name but different package names.
// The two stubs are created on the same channel. // The two stubs are created on the same channel.
TEST_P(End2endTest, DiffPackageServices) { TEST_P(End2endTest, DiffPackageServices) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1192,7 +1150,6 @@ void CancelRpc(ClientContext* context, int delay_us, ServiceType* service) {
} }
TEST_P(End2endTest, CancelRpcBeforeStart) { TEST_P(End2endTest, CancelRpcBeforeStart) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1208,7 +1165,6 @@ TEST_P(End2endTest, CancelRpcBeforeStart) {
} }
TEST_P(End2endTest, CancelRpcAfterStart) { TEST_P(End2endTest, CancelRpcAfterStart) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1245,7 +1201,6 @@ TEST_P(End2endTest, CancelRpcAfterStart) {
// Client cancels request stream after sending two messages // Client cancels request stream after sending two messages
TEST_P(End2endTest, ClientCancelsRequestStream) { TEST_P(End2endTest, ClientCancelsRequestStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1269,7 +1224,6 @@ TEST_P(End2endTest, ClientCancelsRequestStream) {
// Client cancels server stream after sending some messages // Client cancels server stream after sending some messages
TEST_P(End2endTest, ClientCancelsResponseStream) { TEST_P(End2endTest, ClientCancelsResponseStream) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1305,7 +1259,6 @@ TEST_P(End2endTest, ClientCancelsResponseStream) {
// Client cancels bidi stream after sending some messages // Client cancels bidi stream after sending some messages
TEST_P(End2endTest, ClientCancelsBidi) { TEST_P(End2endTest, ClientCancelsBidi) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1341,7 +1294,6 @@ TEST_P(End2endTest, ClientCancelsBidi) {
} }
TEST_P(End2endTest, RpcMaxMessageSize) { TEST_P(End2endTest, RpcMaxMessageSize) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1364,7 +1316,6 @@ void ReaderThreadFunc(ClientReaderWriter<EchoRequest, EchoResponse>* stream,
// Run a Read and a WritesDone simultaneously. // Run a Read and a WritesDone simultaneously.
TEST_P(End2endTest, SimultaneousReadWritesDone) { TEST_P(End2endTest, SimultaneousReadWritesDone) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
ClientContext context; ClientContext context;
gpr_event ev; gpr_event ev;
@ -1379,7 +1330,6 @@ TEST_P(End2endTest, SimultaneousReadWritesDone) {
} }
TEST_P(End2endTest, ChannelState) { TEST_P(End2endTest, ChannelState) {
MAYBE_SKIP_TEST;
if (GetParam().inproc) { if (GetParam().inproc) {
return; return;
} }
@ -1430,7 +1380,6 @@ TEST_P(End2endTest, ChannelStateTimeout) {
// Talking to a non-existing service. // Talking to a non-existing service.
TEST_P(End2endTest, NonExistingService) { TEST_P(End2endTest, NonExistingService) {
MAYBE_SKIP_TEST;
ResetChannel(); ResetChannel();
std::unique_ptr<grpc::testing::UnimplementedEchoService::Stub> stub; std::unique_ptr<grpc::testing::UnimplementedEchoService::Stub> stub;
stub = grpc::testing::UnimplementedEchoService::NewStub(channel_); stub = grpc::testing::UnimplementedEchoService::NewStub(channel_);
@ -1448,7 +1397,6 @@ TEST_P(End2endTest, NonExistingService) {
// Ask the server to send back a serialized proto in trailer. // Ask the server to send back a serialized proto in trailer.
// This is an example of setting error details. // This is an example of setting error details.
TEST_P(End2endTest, BinaryTrailerTest) { TEST_P(End2endTest, BinaryTrailerTest) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1475,7 +1423,6 @@ TEST_P(End2endTest, BinaryTrailerTest) {
} }
TEST_P(End2endTest, ExpectErrorTest) { TEST_P(End2endTest, ExpectErrorTest) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
std::vector<ErrorStatus> expected_status; std::vector<ErrorStatus> expected_status;
@ -1527,13 +1474,11 @@ class ProxyEnd2endTest : public End2endTest {
}; };
TEST_P(ProxyEnd2endTest, SimpleRpc) { TEST_P(ProxyEnd2endTest, SimpleRpc) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
SendRpc(stub_.get(), 1, false); SendRpc(stub_.get(), 1, false);
} }
TEST_P(ProxyEnd2endTest, SimpleRpcWithEmptyMessages) { TEST_P(ProxyEnd2endTest, SimpleRpcWithEmptyMessages) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1544,7 +1489,6 @@ TEST_P(ProxyEnd2endTest, SimpleRpcWithEmptyMessages) {
} }
TEST_P(ProxyEnd2endTest, MultipleRpcs) { TEST_P(ProxyEnd2endTest, MultipleRpcs) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
std::vector<std::thread> threads; std::vector<std::thread> threads;
threads.reserve(10); threads.reserve(10);
@ -1558,7 +1502,6 @@ TEST_P(ProxyEnd2endTest, MultipleRpcs) {
// Set a 10us deadline and make sure proper error is returned. // Set a 10us deadline and make sure proper error is returned.
TEST_P(ProxyEnd2endTest, RpcDeadlineExpires) { TEST_P(ProxyEnd2endTest, RpcDeadlineExpires) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1584,7 +1527,6 @@ TEST_P(ProxyEnd2endTest, RpcDeadlineExpires) {
// Set a long but finite deadline. // Set a long but finite deadline.
TEST_P(ProxyEnd2endTest, RpcLongDeadline) { TEST_P(ProxyEnd2endTest, RpcLongDeadline) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1601,7 +1543,6 @@ TEST_P(ProxyEnd2endTest, RpcLongDeadline) {
// Ask server to echo back the deadline it sees. // Ask server to echo back the deadline it sees.
TEST_P(ProxyEnd2endTest, EchoDeadline) { TEST_P(ProxyEnd2endTest, EchoDeadline) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1627,7 +1568,6 @@ TEST_P(ProxyEnd2endTest, EchoDeadline) {
// Ask server to echo back the deadline it sees. The rpc has no deadline. // Ask server to echo back the deadline it sees. The rpc has no deadline.
TEST_P(ProxyEnd2endTest, EchoDeadlineForNoDeadlineRpc) { TEST_P(ProxyEnd2endTest, EchoDeadlineForNoDeadlineRpc) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1643,7 +1583,6 @@ TEST_P(ProxyEnd2endTest, EchoDeadlineForNoDeadlineRpc) {
} }
TEST_P(ProxyEnd2endTest, UnimplementedRpc) { TEST_P(ProxyEnd2endTest, UnimplementedRpc) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1659,7 +1598,6 @@ TEST_P(ProxyEnd2endTest, UnimplementedRpc) {
// Client cancels rpc after 10ms // Client cancels rpc after 10ms
TEST_P(ProxyEnd2endTest, ClientCancelsRpc) { TEST_P(ProxyEnd2endTest, ClientCancelsRpc) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1694,7 +1632,6 @@ TEST_P(ProxyEnd2endTest, ClientCancelsRpc) {
// Server cancels rpc after 1ms // Server cancels rpc after 1ms
TEST_P(ProxyEnd2endTest, ServerCancelsRpc) { TEST_P(ProxyEnd2endTest, ServerCancelsRpc) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1709,7 +1646,6 @@ TEST_P(ProxyEnd2endTest, ServerCancelsRpc) {
// Make the response larger than the flow control window. // Make the response larger than the flow control window.
TEST_P(ProxyEnd2endTest, HugeResponse) { TEST_P(ProxyEnd2endTest, HugeResponse) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1727,7 +1663,6 @@ TEST_P(ProxyEnd2endTest, HugeResponse) {
} }
TEST_P(ProxyEnd2endTest, Peer) { TEST_P(ProxyEnd2endTest, Peer) {
MAYBE_SKIP_TEST;
// Peer is not meaningful for inproc // Peer is not meaningful for inproc
if (GetParam().inproc) { if (GetParam().inproc) {
return; return;
@ -1756,7 +1691,6 @@ class SecureEnd2endTest : public End2endTest {
}; };
TEST_P(SecureEnd2endTest, SimpleRpcWithHost) { TEST_P(SecureEnd2endTest, SimpleRpcWithHost) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
@ -1788,7 +1722,6 @@ bool MetadataContains(
} }
TEST_P(SecureEnd2endTest, BlockingAuthMetadataPluginAndProcessorSuccess) { TEST_P(SecureEnd2endTest, BlockingAuthMetadataPluginAndProcessorSuccess) {
MAYBE_SKIP_TEST;
auto* processor = new TestAuthMetadataProcessor(true); auto* processor = new TestAuthMetadataProcessor(true);
StartServer(std::shared_ptr<AuthMetadataProcessor>(processor)); StartServer(std::shared_ptr<AuthMetadataProcessor>(processor));
ResetStub(); ResetStub();
@ -1814,7 +1747,6 @@ TEST_P(SecureEnd2endTest, BlockingAuthMetadataPluginAndProcessorSuccess) {
} }
TEST_P(SecureEnd2endTest, BlockingAuthMetadataPluginAndProcessorFailure) { TEST_P(SecureEnd2endTest, BlockingAuthMetadataPluginAndProcessorFailure) {
MAYBE_SKIP_TEST;
auto* processor = new TestAuthMetadataProcessor(true); auto* processor = new TestAuthMetadataProcessor(true);
StartServer(std::shared_ptr<AuthMetadataProcessor>(processor)); StartServer(std::shared_ptr<AuthMetadataProcessor>(processor));
ResetStub(); ResetStub();
@ -1830,7 +1762,6 @@ TEST_P(SecureEnd2endTest, BlockingAuthMetadataPluginAndProcessorFailure) {
} }
TEST_P(SecureEnd2endTest, SetPerCallCredentials) { TEST_P(SecureEnd2endTest, SetPerCallCredentials) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1881,7 +1812,6 @@ class CredentialsInterceptorFactory
}; };
TEST_P(SecureEnd2endTest, CallCredentialsInterception) { TEST_P(SecureEnd2endTest, CallCredentialsInterception) {
MAYBE_SKIP_TEST;
if (!GetParam().use_interceptors) { if (!GetParam().use_interceptors) {
return; return;
} }
@ -1911,7 +1841,6 @@ TEST_P(SecureEnd2endTest, CallCredentialsInterception) {
} }
TEST_P(SecureEnd2endTest, CallCredentialsInterceptionWithSetCredentials) { TEST_P(SecureEnd2endTest, CallCredentialsInterceptionWithSetCredentials) {
MAYBE_SKIP_TEST;
if (!GetParam().use_interceptors) { if (!GetParam().use_interceptors) {
return; return;
} }
@ -1946,7 +1875,6 @@ TEST_P(SecureEnd2endTest, CallCredentialsInterceptionWithSetCredentials) {
} }
TEST_P(SecureEnd2endTest, OverridePerCallCredentials) { TEST_P(SecureEnd2endTest, OverridePerCallCredentials) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -1984,7 +1912,6 @@ TEST_P(SecureEnd2endTest, OverridePerCallCredentials) {
} }
TEST_P(SecureEnd2endTest, AuthMetadataPluginKeyFailure) { TEST_P(SecureEnd2endTest, AuthMetadataPluginKeyFailure) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -2005,7 +1932,6 @@ TEST_P(SecureEnd2endTest, AuthMetadataPluginKeyFailure) {
} }
TEST_P(SecureEnd2endTest, AuthMetadataPluginValueFailure) { TEST_P(SecureEnd2endTest, AuthMetadataPluginValueFailure) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -2025,7 +1951,6 @@ TEST_P(SecureEnd2endTest, AuthMetadataPluginValueFailure) {
} }
TEST_P(SecureEnd2endTest, AuthMetadataPluginWithDeadline) { TEST_P(SecureEnd2endTest, AuthMetadataPluginWithDeadline) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
request.mutable_param()->set_skip_cancelled_check(true); request.mutable_param()->set_skip_cancelled_check(true);
@ -2051,7 +1976,6 @@ TEST_P(SecureEnd2endTest, AuthMetadataPluginWithDeadline) {
} }
TEST_P(SecureEnd2endTest, AuthMetadataPluginWithCancel) { TEST_P(SecureEnd2endTest, AuthMetadataPluginWithCancel) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
request.mutable_param()->set_skip_cancelled_check(true); request.mutable_param()->set_skip_cancelled_check(true);
@ -2080,7 +2004,6 @@ TEST_P(SecureEnd2endTest, AuthMetadataPluginWithCancel) {
} }
TEST_P(SecureEnd2endTest, NonBlockingAuthMetadataPluginFailure) { TEST_P(SecureEnd2endTest, NonBlockingAuthMetadataPluginFailure) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -2104,7 +2027,6 @@ TEST_P(SecureEnd2endTest, NonBlockingAuthMetadataPluginFailure) {
} }
TEST_P(SecureEnd2endTest, NonBlockingAuthMetadataPluginAndProcessorSuccess) { TEST_P(SecureEnd2endTest, NonBlockingAuthMetadataPluginAndProcessorSuccess) {
MAYBE_SKIP_TEST;
auto* processor = new TestAuthMetadataProcessor(false); auto* processor = new TestAuthMetadataProcessor(false);
StartServer(std::shared_ptr<AuthMetadataProcessor>(processor)); StartServer(std::shared_ptr<AuthMetadataProcessor>(processor));
ResetStub(); ResetStub();
@ -2133,7 +2055,6 @@ TEST_P(SecureEnd2endTest, NonBlockingAuthMetadataPluginAndProcessorSuccess) {
} }
TEST_P(SecureEnd2endTest, NonBlockingAuthMetadataPluginAndProcessorFailure) { TEST_P(SecureEnd2endTest, NonBlockingAuthMetadataPluginAndProcessorFailure) {
MAYBE_SKIP_TEST;
auto* processor = new TestAuthMetadataProcessor(false); auto* processor = new TestAuthMetadataProcessor(false);
StartServer(std::shared_ptr<AuthMetadataProcessor>(processor)); StartServer(std::shared_ptr<AuthMetadataProcessor>(processor));
ResetStub(); ResetStub();
@ -2152,7 +2073,6 @@ TEST_P(SecureEnd2endTest, NonBlockingAuthMetadataPluginAndProcessorFailure) {
} }
TEST_P(SecureEnd2endTest, BlockingAuthMetadataPluginFailure) { TEST_P(SecureEnd2endTest, BlockingAuthMetadataPluginFailure) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -2176,7 +2096,6 @@ TEST_P(SecureEnd2endTest, BlockingAuthMetadataPluginFailure) {
} }
TEST_P(SecureEnd2endTest, CompositeCallCreds) { TEST_P(SecureEnd2endTest, CompositeCallCreds) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -2209,7 +2128,6 @@ TEST_P(SecureEnd2endTest, CompositeCallCreds) {
} }
TEST_P(SecureEnd2endTest, ClientAuthContext) { TEST_P(SecureEnd2endTest, ClientAuthContext) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
EchoResponse response; EchoResponse response;
@ -2254,7 +2172,6 @@ class ResourceQuotaEnd2endTest : public End2endTest {
}; };
TEST_P(ResourceQuotaEnd2endTest, SimpleRequest) { TEST_P(ResourceQuotaEnd2endTest, SimpleRequest) {
MAYBE_SKIP_TEST;
ResetStub(); ResetStub();
EchoRequest request; EchoRequest request;
@ -2352,6 +2269,5 @@ INSTANTIATE_TEST_SUITE_P(
int main(int argc, char** argv) { int main(int argc, char** argv) {
grpc::testing::TestEnvironment env(argc, argv); grpc::testing::TestEnvironment env(argc, argv);
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
int ret = RUN_ALL_TESTS(); return RUN_ALL_TESTS();
return ret;
} }

33
test/cpp/end2end/message_allocator_end2end_test.cc
Unescape View File

@ -45,17 +45,6 @@
#include "test/core/util/test_config.h" #include "test/core/util/test_config.h"
#include "test/cpp/util/test_credentials_provider.h" #include "test/cpp/util/test_credentials_provider.h"
// MAYBE_SKIP_TEST is a macro to determine if this particular test configuration
// should be skipped based on a decision made at SetUp time. In particular, any
// callback tests can only be run if the iomgr can run in the background or if
// the transport is in-process.
#define MAYBE_SKIP_TEST \
do { \
if (do_not_test_) { \
return; \
} \
} while (0)
namespace grpc { namespace grpc {
namespace testing { namespace testing {
namespace { namespace {
@ -117,15 +106,7 @@ void TestScenario::Log() const {
class MessageAllocatorEnd2endTestBase class MessageAllocatorEnd2endTestBase
: public ::testing::TestWithParam<TestScenario> { : public ::testing::TestWithParam<TestScenario> {
protected: protected:
MessageAllocatorEnd2endTestBase() { MessageAllocatorEnd2endTestBase() { GetParam().Log(); }
GetParam().Log();
// if (GetParam().protocol == Protocol::TCP) {
// if (!grpc_iomgr_run_in_background()) {
// do_not_test_ = true;
// return;
// }
// }
}
~MessageAllocatorEnd2endTestBase() = default; ~MessageAllocatorEnd2endTestBase() = default;
@ -210,7 +191,6 @@ class MessageAllocatorEnd2endTestBase
} }
} }
bool do_not_test_{false};
int picked_port_{0}; int picked_port_{0};
std::shared_ptr<Channel> channel_; std::shared_ptr<Channel> channel_;
std::unique_ptr<EchoTestService::Stub> stub_; std::unique_ptr<EchoTestService::Stub> stub_;
@ -222,7 +202,6 @@ class MessageAllocatorEnd2endTestBase
class NullAllocatorTest : public MessageAllocatorEnd2endTestBase {}; class NullAllocatorTest : public MessageAllocatorEnd2endTestBase {};
TEST_P(NullAllocatorTest, SimpleRpc) { TEST_P(NullAllocatorTest, SimpleRpc) {
MAYBE_SKIP_TEST;
CreateServer(nullptr); CreateServer(nullptr);
ResetStub(); ResetStub();
SendRpcs(1); SendRpcs(1);
@ -278,7 +257,6 @@ class SimpleAllocatorTest : public MessageAllocatorEnd2endTestBase {
}; };
TEST_P(SimpleAllocatorTest, SimpleRpc) { TEST_P(SimpleAllocatorTest, SimpleRpc) {
MAYBE_SKIP_TEST;
const int kRpcCount = 10; const int kRpcCount = 10;
std::unique_ptr<SimpleAllocator> allocator(new SimpleAllocator); std::unique_ptr<SimpleAllocator> allocator(new SimpleAllocator);
CreateServer(allocator.get()); CreateServer(allocator.get());
@ -293,7 +271,6 @@ TEST_P(SimpleAllocatorTest, SimpleRpc) {
} }
TEST_P(SimpleAllocatorTest, RpcWithEarlyFreeRequest) { TEST_P(SimpleAllocatorTest, RpcWithEarlyFreeRequest) {
MAYBE_SKIP_TEST;
const int kRpcCount = 10; const int kRpcCount = 10;
std::unique_ptr<SimpleAllocator> allocator(new SimpleAllocator); std::unique_ptr<SimpleAllocator> allocator(new SimpleAllocator);
auto mutator = [](experimental::RpcAllocatorState* allocator_state, auto mutator = [](experimental::RpcAllocatorState* allocator_state,
@ -318,7 +295,6 @@ TEST_P(SimpleAllocatorTest, RpcWithEarlyFreeRequest) {
} }
TEST_P(SimpleAllocatorTest, RpcWithReleaseRequest) { TEST_P(SimpleAllocatorTest, RpcWithReleaseRequest) {
MAYBE_SKIP_TEST;
const int kRpcCount = 10; const int kRpcCount = 10;
std::unique_ptr<SimpleAllocator> allocator(new SimpleAllocator); std::unique_ptr<SimpleAllocator> allocator(new SimpleAllocator);
std::vector<EchoRequest*> released_requests; std::vector<EchoRequest*> released_requests;
@ -378,7 +354,6 @@ class ArenaAllocatorTest : public MessageAllocatorEnd2endTestBase {
}; };
TEST_P(ArenaAllocatorTest, SimpleRpc) { TEST_P(ArenaAllocatorTest, SimpleRpc) {
MAYBE_SKIP_TEST;
const int kRpcCount = 10; const int kRpcCount = 10;
std::unique_ptr<ArenaAllocator> allocator(new ArenaAllocator); std::unique_ptr<ArenaAllocator> allocator(new ArenaAllocator);
CreateServer(allocator.get()); CreateServer(allocator.get());
@ -429,10 +404,6 @@ INSTANTIATE_TEST_SUITE_P(ArenaAllocatorTest, ArenaAllocatorTest,
int main(int argc, char** argv) { int main(int argc, char** argv) {
grpc::testing::TestEnvironment env(argc, argv); grpc::testing::TestEnvironment env(argc, argv);
// The grpc_init is to cover the MAYBE_SKIP_TEST.
grpc_init();
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
int ret = RUN_ALL_TESTS(); return RUN_ALL_TESTS();
grpc_shutdown();
return ret;
} }

Write Preview
Loading…
Cancel
Save