Skip to content

Commit 214e3f3

Browse files
authored
xds_end2end_test: Move RLS tests to their own file (grpc#29290)
* move some code around * remove num_backends parameter from XdsEnd2endTest * remove use_xds_enabled_server param from XdsEnd2endTest * remove xds_resource_does_not_exist_timeout_ms param from XdsEnd2endTest * remove client_load_reporting_interval_seconds param from XdsEnd2endTest * start moving CreateAndStartBackends() into individual tests * finish moving CreateAndStartBackends() into individual tests * remove unused variable * remove SetEdsResourceWithDelay * fix test flake * clang-tidy * clang-format * move test framework to its own library * fix build * clang-format * fix windows build * rename TestType to XdsTestType * move BackendServiceImpl inside of BackendServerThread * clang-format * move AdminServerThread to CSDS test suite * move RLS tests to their own file * remove unnecessary deps * generate_projects
1 parent 1a983ed commit 214e3f3

File tree

6 files changed

+641
-326
lines changed

6 files changed

+641
-326
lines changed

CMakeLists.txt

Lines changed: 177 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build_autogenerated.yaml

Lines changed: 57 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/cpp/end2end/xds/BUILD

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ grpc_cc_test(
112112
"//:grpc",
113113
"//:grpc++",
114114
"//:grpc_resolver_fake",
115-
"//src/proto/grpc/lookup/v1:rls_config_proto",
116-
"//src/proto/grpc/lookup/v1:rls_proto",
117115
"//src/proto/grpc/testing:echo_messages_proto",
118116
"//src/proto/grpc/testing:echo_proto",
119117
"//src/proto/grpc/testing/duplicate:echo_duplicate_proto",
@@ -132,7 +130,6 @@ grpc_cc_test(
132130
"//src/proto/grpc/testing/xds/v3:router_proto",
133131
"//src/proto/grpc/testing/xds/v3:tls_proto",
134132
"//test/core/util:grpc_test_util",
135-
"//test/cpp/end2end:rls_server",
136133
"//test/cpp/util:test_config",
137134
"//test/cpp/util:test_util",
138135
"//test/cpp/util:tls_test_utils",
@@ -190,6 +187,30 @@ grpc_cc_test(
190187
],
191188
)
192189

190+
grpc_cc_test(
191+
name = "xds_rls_end2end_test",
192+
size = "large",
193+
srcs = ["xds_rls_end2end_test.cc"],
194+
external_deps = [
195+
"gtest",
196+
],
197+
linkstatic = True, # Fixes dyld error on MacOS
198+
tags = [
199+
"no_test_ios",
200+
"no_windows",
201+
], # TODO(jtattermusch): fix test on windows
202+
deps = [
203+
":xds_end2end_test_lib",
204+
"//:gpr",
205+
"//:grpc",
206+
"//:grpc++",
207+
"//src/proto/grpc/lookup/v1:rls_config_proto",
208+
"//src/proto/grpc/lookup/v1:rls_proto",
209+
"//test/core/util:grpc_test_util",
210+
"//test/cpp/end2end:rls_server",
211+
],
212+
)
213+
193214
grpc_cc_test(
194215
name = "xds_credentials_end2end_test",
195216
srcs = ["xds_credentials_end2end_test.cc"],

0 commit comments

Comments
 (0)