diff options
| author |  Vijay Pai <vpai@google.com> | 2017-10-10 21:01:56 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2017-10-10 21:01:56 -0700 |
| commit | ac8921be5e8b843be4465baacf2414c949c71f0d (patch) | |
| tree | 255976633179883dcad9e039f07fa52e63ea9991 /test/cpp | |
| parent | 07165cbaf26a2e81710c3f4c0d3cf11bf91c9abb (diff) | |
| parent | a6294056c869eb1557f9c5230cd510cad9a3e12e (diff) | |
Merge branch 'proxy_inproc' into proxy_e2e
Diffstat (limited to 'test/cpp')
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 3131faa196..c5178526f8 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/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, |