diff options
| author |  Vijay Pai <vpai@google.com> | 2016-03-31 09:35:51 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-03-31 09:35:51 -0700 |
| commit | 62bc488c121f49d7ab1da08f9131e5fd7e875f53 (patch) | |
| tree | 79155038436bedb09c3ea49b851b51f1f2809037 /test | |
| parent | bd06e441cc54ea7a2b8058eab760a7f83456e656 (diff) | |
| parent | 2b9012362ca03181eefaec22238c6100e77bb736 (diff) | |
Merge branch 'master' into i_know_virtual_destructors
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/client_config/lb_policies_test.c | 3 | ||||
| -rw-r--r-- | test/cpp/grpclb/grpclb_api_test.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index bc7040de77..ac42891f94 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -43,7 +43,6 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/client_channel.h" -#include "src/core/lib/client_config/lb_policies/round_robin.h" #include "src/core/lib/client_config/lb_policy_registry.h" #include "src/core/lib/support/string.h" #include "src/core/lib/surface/channel.h" @@ -881,7 +880,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_lb_round_robin_trace = 1; + grpc_tracer_set_enabled("round_robin", 1); GPR_ASSERT(grpc_lb_policy_create(&exec_ctx, "this-lb-policy-does-not-exist", NULL) == NULL); diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc index bc8219c1c7..92f93c869c 100644 --- a/test/cpp/grpclb/grpclb_api_test.cc +++ b/test/cpp/grpclb/grpclb_api_test.cc @@ -34,7 +34,7 @@ #include <gtest/gtest.h> #include <string> -#include "src/core/lib/client_config/lb_policies/load_balancer_api.h" +#include "src/core/ext/lb_policy/grpclb/load_balancer_api.h" #include "src/proto/grpc/lb/v0/load_balancer.pb.h" // C++ version namespace grpc { |