diff --git a/azure-cli-requirements-fix.patch b/azure-cli-requirements-fix.patch index 1612a4f..c25bcc8 100644 --- a/azure-cli-requirements-fix.patch +++ b/azure-cli-requirements-fix.patch @@ -1,13 +1,13 @@ -From 86be69c47747729efb9f4a24ce848f88c2c9eb05 Mon Sep 17 00:00:00 2001 +From d7616db1936b0bfb3a2ab8232f9fc6dc76abf664 Mon Sep 17 00:00:00 2001 From: Major Hayden -Date: Tue, 26 Apr 2022 11:47:10 -0500 +Date: Tue, 3 May 2022 07:23:04 -0500 Subject: [PATCH] Relax python requirements --- src/azure-cli-core/setup.py | 4 +- - src/azure-cli/requirements.py3.Linux.txt | 74 ++++++++++++------------ + src/azure-cli/requirements.py3.Linux.txt | 76 ++++++++++++------------ src/azure-cli/setup.py | 18 +++--- - 3 files changed, 48 insertions(+), 48 deletions(-) + 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index 354d39b92..c054e9f26 100644 @@ -32,7 +32,7 @@ index 354d39b92..c054e9f26 100644 'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612 'requests[socks]' diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt -index 16e4b1c11..5de31ccc7 100644 +index 16e4b1c11..cb90761a2 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -1,14 +1,14 @@ @@ -91,13 +91,14 @@ index 16e4b1c11..5de31ccc7 100644 humanfriendly==10.0 -idna==2.8 -invoke==1.2.0 -+idna>=2.8 -+invoke>=1.2.0 - isodate==0.6.0 +-isodate==0.6.0 -javaproperties==0.5.1 -Jinja2==2.11.3 -jmespath==0.9.5 -jsondiff==1.3.0 ++idna>=2.8 ++invoke>=1.2.0 ++isodate>=0.6.0 +javaproperties>=0.5.1 +Jinja2>=2.11.3 +jmespath>=0.9.5 diff --git a/azure-cli.spec b/azure-cli.spec index 3da04b9..98dee3f 100644 --- a/azure-cli.spec +++ b/azure-cli.spec @@ -97,7 +97,7 @@ rm -f %{buildroot}%{_bindir}/az.completion.sh %if %{with tests} %check -%global pytest_args --disable-warnings +%global pytest_args --disable-warnings --verbose --durations=25 # Test azure-cli-telemetry. %pytest %{pytest_args} src/azure-cli-telemetry @@ -108,11 +108,22 @@ rm -f %{buildroot}%{_bindir}/az.completion.sh and not test_get_mgmt_service_client" # Test azure-cli and command modules. -# -# NOTE(mhayden): 🤦🏻‍♂️ Skipping these as some depend on recordings of API calls, -# some depend on recordings that do not exist, and others must talk to various -# endpoints on the internet. Hopefully upstream can get these more -# self-contained soon. +pushd src/azure-cli/azure/cli/command_modules/ +TEST_DIRECTORIES=$(find . -name latest -type d -printf " %p") +# Some dests are disabled because they require network access or +# credentials for testing are not present in the git repo. +%pytest %{pytest_args} $TEST_DIRECTORIES \ + --ignore ./feedback/tests/latest/test_feedback.py \ + --ignore ./serviceconnector/tests/latest/test_webpp_connection_scenario.py \ + -k "not test_keyvault_hsm_key_release_policy \ + and not test_network_app_gateway_with_identity \ + and not test_network_virtual_appliance \ + and not test_login_validate_tenant \ + and not test_create_cluster_with_separate_kv \ + and not test_cert_and_ext \ + and not test_monitor_private_link_scope_scenario \ + and not test_network_security_partner_provider" +popd %endif