Merge 6bf5d9f into 1bf76d5

ansible-collections · Jul 22, 2023 · 9baadab · 9baadab
2 parents 1bf76d5 + 6bf5d9f
commit 9baadab
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -362,6 +362,10 @@ jobs:
       - name: localenv_docker - setup
         run: |
           pwd
+          pip install --upgrade pip setuptools build wheel
+          pip install "Cython<3.0" "pyyaml<6" --no-build-isolation
+          # ^ https://github.com/yaml/pyyaml/issues/601
+          # ^ https://github.com/docker/compose/issues/10836
           pip install -r files/requirements/requirements.txt -c files/requirements/constraints.txt
           ./setup.sh
         working-directory: ${{ env.COLLECTION_INTEGRATION_TARGETS }}/setup_localenv_docker

diff --git a/tests/integration/targets/setup_localenv_docker/files/requirements/constraints.txt b/tests/integration/targets/setup_localenv_docker/files/requirements/constraints.txt
@@ -1,2 +1 @@
 docker >= 5.0.0 ; python_version >= '3.6'
-docker < 5.0.0 ; python_version == '2.7'
diff --git a/tests/integration/targets/setup_localenv_docker/files/requirements/requirements.txt b/tests/integration/targets/setup_localenv_docker/files/requirements/requirements.txt
@@ -1,3 +1,2 @@
 docker
 docker-compose
-six  # https://github.com/ansible-collections/community.docker/issues/171
diff --git a/tests/unit/plugins/module_utils/authentication/test_auth_aws_iam.py b/tests/unit/plugins/module_utils/authentication/test_auth_aws_iam.py
@@ -163,7 +163,7 @@ def test_auth_aws_iam_validate_inferred_creds(self, auth_aws_iam, boto_mocks, ad
 
         params = auth_aws_iam._auth_aws_iam_login_params
 
-        assert boto3.session.Session.called_once_with(profile_name=profile)
+        boto3.session.Session.assert_called_once_with(profile_name=profile)
 
         assert params['access_key'] == aws_access_key
         assert params['secret_key'] == aws_secret_key

diff --git a/tests/unit/plugins/module_utils/authentication/test_auth_azure.py b/tests/unit/plugins/module_utils/authentication/test_auth_azure.py
@@ -157,10 +157,10 @@ def test_auth_azure_validate_use_service_principal(
             credential.get_token.return_value.token = jwt
             auth_azure.validate()
 
-            assert mocked_credential_class.called_once_with(
+            mocked_credential_class.assert_called_once_with(
                 azure_tenant_id, azure_client_id, azure_client_secret
             )
-            assert credential.get_token.called_once_with(
+            credential.get_token.assert_called_once_with(
                 'https://management.azure.com//.default'
             )
 
@@ -194,8 +194,8 @@ def test_auth_azure_validate_use_user_managed_identity(
             credential.get_token.return_value.token = jwt
             auth_azure.validate()
 
-            assert mocked_credential_class.called_once_with(azure_client_id)
-            assert credential.get_token.called_once_with(
+            mocked_credential_class.assert_called_once_with(client_id=azure_client_id)
+            credential.get_token.assert_called_once_with(
                 'https://management.azure.com//.default'
             )
 
@@ -215,8 +215,8 @@ def test_auth_azure_validate_use_system_managed_identity(
             credential.get_token.return_value.token = jwt
             auth_azure.validate()
 
-            assert mocked_credential_class.called_once_with()
-            assert credential.get_token.called_once_with(
+            mocked_credential_class.assert_called_once_with()
+            credential.get_token.assert_called_once_with(
                 'https://management.azure.com//.default'
             )