diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-11-02 14:18:30 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-11-02 14:18:30 -0800 |
| commit | 93b944785c9fe9b6fd0d1781027fb072fe818496 (patch) | |
| tree | 2b7e3f4bb093ab39871ef809fa9131aa6a2102f7 /test/cpp | |
| parent | c7e1a2a38d856762cab3e7dea9f59b4d651eec80 (diff) | |
stream_op cleanup: test fixes and updates
Diffstat (limited to 'test/cpp')
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 10 | ||||
| -rw-r--r-- | test/cpp/interop/interop_client.cc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 89a556c587..c5c7185026 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -1217,14 +1217,14 @@ TEST_P(SecureEnd2endTest, ClientAuthContext) { } INSTANTIATE_TEST_CASE_P(End2end, End2endTest, - ::testing::Values(TestScenario(false, true), - TestScenario(false, false))); + ::testing::Values(TestScenario(false, false), + TestScenario(false, true))); INSTANTIATE_TEST_CASE_P(ProxyEnd2end, ProxyEnd2endTest, - ::testing::Values(TestScenario(true, true), - TestScenario(true, false), + ::testing::Values(TestScenario(false, false), TestScenario(false, true), - TestScenario(false, false))); + TestScenario(true, false), + TestScenario(true, true))); INSTANTIATE_TEST_CASE_P(SecureEnd2end, SecureEnd2endTest, ::testing::Values(TestScenario(false, true))); diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc index 96502e5879..46a5255e4c 100644 --- a/test/cpp/interop/interop_client.cc +++ b/test/cpp/interop/interop_client.cc @@ -46,7 +46,7 @@ #include <grpc++/client_context.h> #include <grpc++/security/credentials.h> -#include "src/core/transport/stream_op.h" +#include "src/core/transport/byte_stream.h" #include "test/cpp/interop/client_helper.h" #include "test/proto/test.grpc.pb.h" #include "test/proto/empty.grpc.pb.h" |