Skip to content

Commit

Permalink
[PSM Interop] Skip Circuit Breaking test in the legacy test driver (g…
Browse files Browse the repository at this point in the history
…rpc#36672)

Circuit breaking ported to the new framework: https://github.com/grpc/psm-interop/blob/main/tests/circuit_breaking_test.py.

To avoid backports, skipping it in the legacy test driver.

ref b/227678751

Closes grpc#36672

COPYBARA_INTEGRATE_REVIEW=grpc#36672 from sergiitk:psm-interop-legacy-circuit-breaking 2cebe22
PiperOrigin-RevId: 635619565
  • Loading branch information
sergiitk authored and copybara-github committed May 21, 2024
1 parent a509c6b commit 5a7a07a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export PYTHONUNBUFFERED=true
GRPC_VERBOSITY=debug GRPC_TRACE=xds_client,xds_resolver,xds_cluster_manager_lb,cds_lb,xds_cluster_resolver_lb,priority_lb,xds_cluster_impl_lb,weighted_target_lb "$PYTHON" \
/var/local/git/grpc/tools/run_tests/run_xds_tests.py \
--halt_after_fail \
--test_case="ping_pong,circuit_breaking" \
--test_case="ping_pong" \
--project_id=grpc-testing \
--project_num=830293263384 \
--source_image=projects/grpc-testing/global/images/xds-test-server-5 \
Expand Down
2 changes: 1 addition & 1 deletion tools/internal_ci/linux/grpc_xds_bazel_test_in_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ bazel build test/cpp/interop:xds_interop_client
GRPC_VERBOSITY=debug GRPC_TRACE=xds_client,xds_resolver,xds_cluster_manager_lb,cds_lb,xds_cluster_resolver_lb,priority_lb,xds_cluster_impl_lb,weighted_target_lb "$PYTHON" \
/var/local/git/grpc/tools/run_tests/run_xds_tests.py \
--halt_after_fail \
--test_case="ping_pong,circuit_breaking" \
--test_case="ping_pong" \
--project_id=grpc-testing \
--project_num=830293263384 \
--source_image=projects/grpc-testing/global/images/xds-test-server-5 \
Expand Down
10 changes: 10 additions & 0 deletions tools/run_tests/run_xds_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4066,6 +4066,16 @@ def __init__(self, compute, alpha_compute, project, project_num):
client_env["GRPC_XDS_EXPERIMENTAL_ENABLE_TIMEOUT"] = "true"
client_env["GRPC_XDS_EXPERIMENTAL_FAULT_INJECTION"] = "true"
for test_case in args.test_case:
# Circuit breaking ported to the new framework.
# https://github.com/grpc/psm-interop/blob/main/tests/circuit_breaking_test.py
# To avoid backports, skipping it in the driver.
if test_case == "circuit_breaking":
logger.info(
"Ported to https://github.com/grpc/psm-interop/"
"blob/main/tests/circuit_breaking_test.py"
)
continue

if test_case in _V3_TEST_CASES and not args.xds_v3_support:
logger.info(
"skipping test %s due to missing v3 support", test_case
Expand Down

0 comments on commit 5a7a07a

Please sign in to comment.