This is an automated email from the ASF dual-hosted git repository. joemcdonnell pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit 2f74e956aa10db5af6a7cdc47e2ad42f63d5030f Author: Joe McDonnell <[email protected]> AuthorDate: Thu Aug 11 20:35:17 2022 -0700 IMPALA-11472: Reduce test dimensions for TestClientSsl With the addition of extra dimensions for varients of impala-shell, TestClientSsl currently runs four different shells against three different protocols for a total of 12 dimensions. Some tests in TestClientSsl take a while to run (e.g. test_wildcard_ssl takes 4 minutes on some platforms). This can take over an hour to run. This reduces the test dimensions to only tests two shells (dev python2 and dev python3) with two protocols (HS2 and HS2-HTTP) for a total of 4 dimensions. This should reduce the runtime significantly. Testing: - Ran TestClientSsl locally and checked the test dimensions - Ran shell tests and checked that their test dimensions don't change Change-Id: I3d4a4792a37cba2231d9999e8bfa2279ba029a05 Reviewed-on: http://gerrit.cloudera.org:8080/18843 Tested-by: Impala Public Jenkins <[email protected]> Reviewed-by: Joe McDonnell <[email protected]> --- tests/custom_cluster/test_client_ssl.py | 8 +++++++- tests/shell/util.py | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/custom_cluster/test_client_ssl.py b/tests/custom_cluster/test_client_ssl.py index 0c56948fd..c368cc4d0 100644 --- a/tests/custom_cluster/test_client_ssl.py +++ b/tests/custom_cluster/test_client_ssl.py @@ -141,8 +141,14 @@ class TestClientSsl(CustomClusterTestSuite): @classmethod def add_test_dimensions(cls): super(TestClientSsl, cls).add_test_dimensions() + # Limit the test dimensions to avoid long run times. This runs hs2 and hs2-http + # with only the dev shells (python2 and python3) for a total of up to 4 + # dimensions. cls.ImpalaTestMatrix.add_dimension(create_client_protocol_dimension()) - cls.ImpalaTestMatrix.add_dimension(create_impala_shell_executable_dimension()) + cls.ImpalaTestMatrix.add_dimension( + create_impala_shell_executable_dimension(dev_only=True)) + cls.ImpalaTestMatrix.add_constraint(lambda v: + v.get_value('protocol') != 'beeswax') @pytest.mark.execute_serially @CustomClusterTestSuite.with_args(impalad_args=WEBSERVER_SSL_ARGS, diff --git a/tests/shell/util.py b/tests/shell/util.py index 545cfd30a..98982d126 100755 --- a/tests/shell/util.py +++ b/tests/shell/util.py @@ -334,9 +334,9 @@ def get_dev_impala_shell_executable(): "impala-shell-" + IMPALA_LOCAL_BUILD_VERSION, "impala-shell"), True -def create_impala_shell_executable_dimension(): +def create_impala_shell_executable_dimension(dev_only=False): _, include_pypi = get_dev_impala_shell_executable() - if include_pypi: + if include_pypi and not dev_only: if 'DISABLE_PYTHON3_TEST' in os.environ: return ImpalaTestDimension('impala_shell', 'dev', 'python2') else:
