pull/28759/merge
yifeizhuang 3 years ago committed by GitHub
parent c8c1774ec4
commit 63398540b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py
  2. 3
      tools/run_tests/xds_k8s_test_driver/tests/api_listener_test.py

@ -63,7 +63,6 @@ KubernetesClientRunner = client_app.KubernetesClientRunner
LoadBalancerStatsResponse = grpc_testing.LoadBalancerStatsResponse
_ChannelState = grpc_channelz.ChannelState
_timedelta = datetime.timedelta
DumpedXdsConfig = xds_url_map_testcase.DumpedXdsConfig
ClientConfig = framework.rpc.grpc_csds.ClientConfig
_TD_CONFIG_MAX_WAIT_SEC = 600
@ -369,7 +368,7 @@ class XdsKubernetesTestCase(absltest.TestCase, metaclass=abc.ABCMeta):
self.assertSuccessfulRpcs(test_client)
raw_config = test_client.csds.fetch_client_status(
log_level=logging.INFO)
dumped_config = DumpedXdsConfig(
dumped_config = xds_url_map_testcase.DumpedXdsConfig(
json_format.MessageToDict(raw_config))
route_config_version = dumped_config.rds_version
if previous_route_config_version == route_config_version:

@ -18,6 +18,7 @@ from absl.testing import absltest
from google.protobuf import json_format
from framework import xds_k8s_testcase
from framework import xds_url_map_testcase
logger = logging.getLogger(__name__)
flags.adopt_module_key_flags(xds_k8s_testcase)
@ -25,7 +26,7 @@ flags.adopt_module_key_flags(xds_k8s_testcase)
# Type aliases
_XdsTestServer = xds_k8s_testcase.XdsTestServer
_XdsTestClient = xds_k8s_testcase.XdsTestClient
_DumpedXdsConfig = xds_k8s_testcase.DumpedXdsConfig
_DumpedXdsConfig = xds_url_map_testcase.DumpedXdsConfig
_TD_CONFIG_RETRY_WAIT_SEC = 2

Loading…
Cancel
Save