From 566f1a425f1da52061d9d86e0b9bd328e0f66f69 Mon Sep 17 00:00:00 2001 From: Ekaterina Chernitsyna Date: Mon, 29 Jan 2024 19:00:47 +0300 Subject: [PATCH] [#189] parallel get remote binaries versions --- pytest_tests/testsuites/conftest.py | 2 +- pytest_tests/testsuites/services/test_binaries.py | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pytest_tests/testsuites/conftest.py b/pytest_tests/testsuites/conftest.py index 8e0b8b14..ca7869e8 100644 --- a/pytest_tests/testsuites/conftest.py +++ b/pytest_tests/testsuites/conftest.py @@ -326,7 +326,7 @@ def two_buckets(s3_client: S3ClientWrapper, request: pytest.FixtureRequest): @pytest.fixture(scope="session", autouse=True) def check_binary_versions(hosting: Hosting, client_shell: Shell, request: pytest.FixtureRequest): local_versions = version_utils.get_local_binaries_versions(client_shell) - remote_versions = version_utils.get_remote_binaries_versions(hosting) + remote_versions, exсeptions_remote_binaries_versions = version_utils.get_remote_binaries_versions(hosting) all_versions = { **local_versions, diff --git a/pytest_tests/testsuites/services/test_binaries.py b/pytest_tests/testsuites/services/test_binaries.py index 3ff60722..0307ad3e 100644 --- a/pytest_tests/testsuites/services/test_binaries.py +++ b/pytest_tests/testsuites/services/test_binaries.py @@ -23,21 +23,21 @@ def test_binaries_versions(request: FixtureRequest, hosting: Hosting): Compare binaries versions from external source (url) and deployed on servers. """ with reporter.step("Get binaries versions from servers"): - got_versions = get_remote_binaries_versions(hosting) + got_versions, exсeptions_remote_binaries_versions = get_remote_binaries_versions(hosting) environment_dir = request.config.getoption("--alluredir") or ASSETS_DIR env_file = os.path.join(environment_dir, "environment.properties") env_properties = read_env_properties(env_file) # compare versions from servers and file - exeptions = [] + exсeptions = [] additional_env_properties = {} for binary_name, binary in got_versions.items(): version = binary["version"] requires_check = binary["check"] if requires_check and not fullmatch(r"^\d+\.\d+\.\d+(-.*)?(?