[PSM Interop] Fix bad merge: NameError: name 'absltest' is not defined (#34128)

Cause: #34097
pull/34125/head^2
Sergii Tkachenko 2 years ago committed by GitHub
parent c867c418c1
commit ffbd3f89b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      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 typing import Any, Callable, List, Optional, Tuple, Union
from absl import flags from absl import flags
from absl.testing import absltest
from google.protobuf import json_format from google.protobuf import json_format
import grpc import grpc
@ -73,9 +74,6 @@ _LoadBalancerAccumulatedStatsResponse = (
_ChannelState = grpc_channelz.ChannelState _ChannelState = grpc_channelz.ChannelState
_timedelta = datetime.timedelta _timedelta = datetime.timedelta
ClientConfig = grpc_csds.ClientConfig 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. # pylint complains about signal.Signals for some reason.
_SignalNum = Union[int, signal.Signals] # pylint: disable=no-member _SignalNum = Union[int, signal.Signals] # pylint: disable=no-member
_SignalHandler = Callable[[_SignalNum, Optional[FrameType]], Any] _SignalHandler = Callable[[_SignalNum, Optional[FrameType]], Any]
@ -101,7 +99,7 @@ def evaluate_test_config(
) )
if not check(test_config): if not check(test_config):
logger.info("Skipping %s", 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) logger.info("Detected language and version: %s", test_config)
return test_config return test_config

Loading…
Cancel
Save