diff --git a/awscli2.spec b/awscli2.spec index 03a8bc0..9a9a40a 100644 --- a/awscli2.spec +++ b/awscli2.spec @@ -1,8 +1,8 @@ %if 0%{?rhel} # some tests fail on EL9 -%bcond_with all_tests +%bcond_with tests %else -%bcond_without all_tests +%bcond_without tests %endif %global pkgname aws-cli @@ -25,6 +25,9 @@ Patch0: ruamel-yaml-0.17.32.patch BuildArch: noarch +%if 0%{?centos_hs} +BuildRequires: epel-rpm-macros +%endif BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python-unversioned-command BuildRequires: procps-ng @@ -107,96 +110,8 @@ sed -i '/self.driver.start(env=env)/i \ \ \ \ \ \ \ \ env["PYTHONPATH"] = "%{bui tests/utils/botocore/__init__.py export TESTS_REMOVE_REPO_ROOT_FROM_PATH=1 TZ=UTC -# =========================== short test summary info ============================ -# FAILED tests/functional/cloudfront/test_sign.py::TestSign::test_canned_policy -# FAILED tests/functional/cloudfront/test_sign.py::TestSign::test_custom_policy -# FAILED tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_fails -# FAILED tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_success -# ERROR tests/functional/autocomplete/test_completion_files.py -# ERROR tests/functional/botocore/test_waiter_config.py -# ======= 4 failed, 64966 passed, 7 skipped, 2 errors in 874.01s (0:14:34) ======= -# -# the latter are weird -# ==================================== ERRORS ==================================== -# ___ ERROR collecting tests/functional/autocomplete/test_completion_files.py ____ -# ImportError while importing test module '/builddir/build/BUILD/aws-cli-2.13.4/tests/functional/autocomplete/test_completion_files.py'. -# Hint: make sure your test modules/packages have valid Python names. -# Traceback: -# /usr/lib64/python3.9/importlib/__init__.py:127: in import_module -# return _bootstrap._gcd_import(name[level:], package, level) -# tests/functional/autocomplete/test_completion_files.py:14: in -# from jsonschema import Draft4Validator -# /usr/lib/python3.9/site-packages/jsonschema/__init__.py:34: in -# __version__ = metadata.version("jsonschema") -# /usr/lib64/python3.9/importlib/metadata.py:569: in version -# return distribution(distribution_name).version -# /usr/lib64/python3.9/importlib/metadata.py:542: in distribution -# return Distribution.from_name(distribution_name) -# /usr/lib64/python3.9/importlib/metadata.py:196: in from_name -# raise PackageNotFoundError(name) -# E importlib.metadata.PackageNotFoundError: jsonschema -# _______ ERROR collecting tests/functional/botocore/test_waiter_config.py _______ -# ImportError while importing test module '/builddir/build/BUILD/aws-cli-2.13.4/tests/functional/botocore/test_waiter_config.py'. -# Hint: make sure your test modules/packages have valid Python names. -# Traceback: -# /usr/lib64/python3.9/importlib/__init__.py:127: in import_module -# return _bootstrap._gcd_import(name[level:], package, level) -# tests/functional/botocore/test_waiter_config.py:14: in -# from jsonschema import Draft4Validator -# /usr/lib/python3.9/site-packages/jsonschema/__init__.py:34: in -# __version__ = metadata.version("jsonschema") -# /usr/lib64/python3.9/importlib/metadata.py:569: in version -# return distribution(distribution_name).version -# /usr/lib64/python3.9/importlib/metadata.py:542: in distribution -# return Distribution.from_name(distribution_name) -# /usr/lib64/python3.9/importlib/metadata.py:196: in from_name -# raise PackageNotFoundError(name) -# E importlib.metadata.PackageNotFoundError: jsonschema -# =========================== short test summary info ============================ -# ERROR tests/functional/autocomplete/test_completion_files.py -# ERROR tests/functional/botocore/test_waiter_config.py -# ============ 64963 passed, 7 skipped, 2 errors in 942.68s (0:15:42) ============ -# -# =========================== short test summary info ============================ -# FAILED tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored - Va... -# FAILED tests/unit/customizations/test_sessionmanager.py::TestSessionManager::test_start_session_when_no_profile_is_passed -# FAILED tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success -# ============ 3 failed, 64962 passed, 7 skipped in 858.78s (0:14:18) ============ -# -# =========================== short test summary info ============================ -# FAILED tests/functional/test_no_event_streams.py::test_no_event_stream_unless_allowed -# FAILED tests/functional/test_output.py::TestYAMLStream::test_yaml_stream_paginated_response -# FAILED tests/functional/test_output.py::TestYAMLStream::test_yaml_stream_removes_response_metadata_for_all_responses -# FAILED tests/functional/botocore/test_paginate.py::TestRDSPagination::test_can_specify_zero_marker -# FAILED tests/functional/botocore/test_paginate.py::TestAutoscalingPagination::test_repeated_build_full_results -# FAILED tests/functional/botocore/test_paginate.py::TestCloudwatchLogsPagination::test_token_with_triple_underscores -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_success -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_with_cabundle_ssuccess -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_with_con_timeout_ssuccess -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_with_no_paginate_ssuccess -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_with_no_sign_request_ssuccess -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_with_no_verify_ssl_ssuccess -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_with_output_json_ssuccess -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_with_read_timeout_ssuccess -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_with_region_success -# FAILED tests/functional/lightsail/test_push_container_image.py::TestPushContainerImageTest::test_start_lightsailctl_with_url_success -# =========== 16 failed, 64945 passed, 7 skipped in 858.70s (0:14:18) ============ -# -%if %{with all_tests} +%if %{with tests} %pytest --verbose --numprocesses=auto --dist=loadfile tests/unit tests/functional -%else -EXCLUDES="not test_canned_policy and not test_custom_policy" -EXCLUDES+=" and not test_start_session_fails and not test_start_session_success" -EXCLUDES+=" and not test_ctrl_c_is_ignored and not test_start_session_when_no_profile_is_passed" -EXCLUDES+=" and not test_execute_command_success" -EXCLUDES+=" and not test_no_event_stream_unless_allowed" -EXCLUDES+=" and not test_yaml_stream_paginated_response and not test_yaml_stream_removes_response_metadata_for_all_responses" -EXCLUDES+=" and not test_can_specify_zero_marker and not test_repeated_build_full_results" -EXCLUDES+=" and not test_token_with_triple_underscore" -%pytest --verbose --numprocesses=auto --dist=loadfile tests/unit tests/functional \ - -k "$EXCLUDES" --ignore=tests/functional/autocomplete/test_completion_files.py \ - --ignore=tests/functional/botocore/test_waiter_config.py \ - --ignore=tests/functional/lightsail/test_push_container_image.py %endif @@ -210,5 +125,5 @@ EXCLUDES+=" and not test_token_with_triple_underscore" %changelog -* Mon Sep 11 2023 Michel Lind - 2.13.4-1.1 +* Mon Nov 20 2023 Michel Lind - 2.13.4-1.1 - Initial Hyperscale release, adapted from 2.13.4-1.fc38