diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-06-07 13:00:06 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-06-07 13:00:06 -0700 |
| commit | 1c8a90473dd3da08287fb6a474c4c708f87241c9 (patch) | |
| tree | 9b5b84bfa53f36eb9f94c453a8da28509bd4fb70 /test/core/client_channel | |
| parent | dfd7a4dc0da88b63710ce51e61b827fe0af3ffce (diff) | |
| parent | 3f02e8cb4ba8882ee710b6af766bc7c6b74594e4 (diff) | |
Merge github.com:grpc/grpc into ALL-the-things
Diffstat (limited to 'test/core/client_channel')
| -rw-r--r-- | test/core/client_channel/resolvers/BUILD | 2 | ||||
| -rw-r--r-- | test/core/client_channel/resolvers/fake_resolver_test.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/test/core/client_channel/resolvers/BUILD b/test/core/client_channel/resolvers/BUILD index 80ca7d3ebb..030f6091b5 100644 --- a/test/core/client_channel/resolvers/BUILD +++ b/test/core/client_channel/resolvers/BUILD @@ -74,7 +74,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", - "//test/core/end2end:fake_resolver", + "//:grpc_resolver_fake", "//test/core/util:gpr_test_util", "//test/core/util:grpc_test_util", ], diff --git a/test/core/client_channel/resolvers/fake_resolver_test.c b/test/core/client_channel/resolvers/fake_resolver_test.c index 934fb1b074..1504f5a2b6 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.c +++ b/test/core/client_channel/resolvers/fake_resolver_test.c @@ -39,18 +39,18 @@ #include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/ext/filters/client_channel/parse_address.h" +#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "test/core/end2end/fake_resolver.h" #include "test/core/util/test_config.h" static grpc_resolver *build_fake_resolver( grpc_exec_ctx *exec_ctx, grpc_combiner *combiner, grpc_fake_resolver_response_generator *response_generator) { - grpc_resolver_factory *factory = grpc_resolver_factory_lookup("test"); + grpc_resolver_factory *factory = grpc_resolver_factory_lookup("fake"); grpc_arg generator_arg = grpc_fake_resolver_response_generator_arg(response_generator); grpc_resolver_args args; @@ -183,7 +183,6 @@ static void test_fake_resolver() { int main(int argc, char **argv) { grpc_test_init(argc, argv); - grpc_fake_resolver_init(); // Registers the "test" scheme. grpc_init(); test_fake_resolver(); |