Merge branch 'proxy_inproc' into proxy_e2e

pull/12939/head
Vijay Pai 7 years ago
commit ac8921be5e
  1. 13
      test/cpp/end2end/end2end_test.cc

@ -1409,6 +1409,10 @@ TEST_P(ProxyEnd2endTest, HugeResponse) {
}
TEST_P(ProxyEnd2endTest, Peer) {
// Peer is not meaningful for inproc
if (GetParam().inproc) {
return;
}
ResetStub();
EchoRequest request;
EchoResponse response;
@ -1777,11 +1781,10 @@ std::vector<TestScenario> CreateTestScenarios(bool use_proxy,
credentials_types.push_back(kInsecureCredentialsType);
}
GPR_ASSERT(!credentials_types.empty());
for (auto it = credentials_types.begin(); it != credentials_types.end();
++it) {
scenarios.emplace_back(false, false, *it);
for (const auto& cred : credentials_types) {
scenarios.emplace_back(false, false, cred);
if (use_proxy) {
scenarios.emplace_back(true, false, *it);
scenarios.emplace_back(true, false, cred);
}
}
if (test_inproc && insec_ok()) {
@ -1800,7 +1803,7 @@ INSTANTIATE_TEST_CASE_P(End2endServerTryCancel, End2endServerTryCancelTest,
INSTANTIATE_TEST_CASE_P(ProxyEnd2end, ProxyEnd2endTest,
::testing::ValuesIn(CreateTestScenarios(true, true,
true, false)));
true, true)));
INSTANTIATE_TEST_CASE_P(SecureEnd2end, SecureEnd2endTest,
::testing::ValuesIn(CreateTestScenarios(false, false,

Loading…
Cancel
Save