From ffbd3f89b171e2b87fe6f6f6a1e952a1558f479d Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Tue, 22 Aug 2023 14:31:02 -0400 Subject: [PATCH] [PSM Interop] Fix bad merge: NameError: name 'absltest' is not defined (#34128) Cause: #34097 --- .../xds_k8s_test_driver/framework/xds_k8s_testcase.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py b/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py index 47454c3a246..e3487cbfb75 100644 --- a/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py +++ b/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py @@ -24,6 +24,7 @@ from types import FrameType from typing import Any, Callable, List, Optional, Tuple, Union from absl import flags +from absl.testing import absltest from google.protobuf import json_format import grpc @@ -73,9 +74,6 @@ _LoadBalancerAccumulatedStatsResponse = ( _ChannelState = grpc_channelz.ChannelState _timedelta = datetime.timedelta ClientConfig = grpc_csds.ClientConfig -# TODO(sergiitk): remove when pylint upgraded. Now it complains about -# "Undefined variable 'absltest'" in evaluate_test_config for some reason. -_SkipTest = absltest.SkipTest # pylint: disable=undefined-variable # pylint complains about signal.Signals for some reason. _SignalNum = Union[int, signal.Signals] # pylint: disable=no-member _SignalHandler = Callable[[_SignalNum, Optional[FrameType]], Any] @@ -101,7 +99,7 @@ def evaluate_test_config( ) if not check(test_config): logger.info("Skipping %s", test_config) - raise _SkipTest(f"Unsupported test config: {test_config}") + raise absltest.SkipTest(f"Unsupported test config: {test_config}") logger.info("Detected language and version: %s", test_config) return test_config