From 757a7c1296736a07e71ba262b0e2215c16e8154f Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Sun, 5 Sep 2021 07:44:43 -0700 Subject: [PATCH 1/4] undo --- tools/c7n_azure/tests_azure/test_session.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/c7n_azure/tests_azure/test_session.py b/tools/c7n_azure/tests_azure/test_session.py index 8723a832faf..9430696350f 100644 --- a/tools/c7n_azure/tests_azure/test_session.py +++ b/tools/c7n_azure/tests_azure/test_session.py @@ -382,7 +382,6 @@ def test_get_auth_endpoint_storage(self): # this seems to be failing on windows ci infra # https://github.com/cloud-custodian/cloud-custodian/runs/3506742597 - @pytest.mark.skipif(platform.system() == 'Windows', reason="Windows CI Issue") @patch('c7n_azure.utils.C7nRetryPolicy.__init__', return_value=None) def test_retry_policy_override(self, c7n_retry): s = Session() From 4e91f82ed088b1f1bd74e850cfa6423f9fe5500a Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Sun, 5 Sep 2021 07:53:00 -0700 Subject: [PATCH 2/4] fix --- tools/c7n_azure/tests_azure/test_session.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/c7n_azure/tests_azure/test_session.py b/tools/c7n_azure/tests_azure/test_session.py index 9430696350f..58b3f5218d0 100644 --- a/tools/c7n_azure/tests_azure/test_session.py +++ b/tools/c7n_azure/tests_azure/test_session.py @@ -2,7 +2,6 @@ # SPDX-License-Identifier: Apache-2.0 import json import os -import platform import re import sys from importlib import reload From 54d8d7eaae2552bc665e4792e7d4eca049624cf7 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Sun, 5 Sep 2021 09:13:05 -0700 Subject: [PATCH 3/4] Fix patches --- tools/c7n_azure/tests_azure/test_session.py | 23 +++++---------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/tools/c7n_azure/tests_azure/test_session.py b/tools/c7n_azure/tests_azure/test_session.py index 58b3f5218d0..d132a51ce65 100644 --- a/tools/c7n_azure/tests_azure/test_session.py +++ b/tools/c7n_azure/tests_azure/test_session.py @@ -4,7 +4,6 @@ import os import re import sys -from importlib import reload import pytest from adal import AdalError @@ -33,12 +32,6 @@ class SessionTest(BaseTest): 'data', 'test_auth_file_no_sub.json') - def setUp(self): - super(SessionTest, self).setUp() - - def tearDown(self): - super(SessionTest, self).tearDown() - reload(sys.modules['c7n_azure.session']) def mock_init(self, client_id, secret, tenant, resource): pass @@ -258,7 +251,7 @@ def xtest_get_function_target_subscription(self): constants.ENV_CLIENT_SECRET: 'secret', constants.ENV_FUNCTION_MANAGEMENT_GROUP_NAME: 'test' }, clear=True): - with patch('c7n_azure.utils.ManagedGroupHelper.get_subscriptions_list', + with patch('c7n_azure.session.ManagedGroupHelper.get_subscriptions_list', return_value=[]): s = Session() self.assertEqual(s.get_function_target_subscription_name(), 'test') @@ -300,9 +293,8 @@ def test_get_client_us_gov(self): self.assertEqual(AZURE_US_GOV_CLOUD.endpoints.management + ".default", client._client._config.credential_scopes[0]) - @patch('c7n_azure.utils.get_keyvault_secret', return_value='{}') + @patch('c7n_azure.session.get_keyvault_secret', return_value='{}') def test_compare_auth_params(self, _1): - reload(sys.modules['c7n_azure.session']) with patch.dict(os.environ, { constants.ENV_TENANT_ID: 'tenant', @@ -323,10 +315,9 @@ def test_compare_auth_params(self, _1): self.assertFalse(file_params.pop('enable_cli_auth', None)) self.assertEqual(env_params, file_params) - @patch('c7n_azure.utils.get_keyvault_secret', + @patch('c7n_azure.session.get_keyvault_secret', return_value='{"client_id": "client", "client_secret": "secret"}') def test_kv_patch(self, _1): - reload(sys.modules['c7n_azure.session']) with patch.dict(os.environ, { constants.ENV_TENANT_ID: 'tenant', @@ -342,11 +333,9 @@ def test_kv_patch(self, _1): self.assertEqual(auth_params.get('client_id'), 'client') self.assertEqual(auth_params.get('client_secret'), 'secret') - @patch('c7n_azure.utils.get_keyvault_secret') + @patch('c7n_azure.session.get_keyvault_secret') @patch('c7n_azure.session.log.error') def test_initialize_session_kv_authentication_error(self, mock_log, mock_get_kv_secret): - reload(sys.modules['c7n_azure.session']) - with self.assertRaises(SystemExit): mock_get_kv_secret.side_effect = HTTPError() @@ -379,9 +368,7 @@ def test_get_auth_endpoint_storage(self): result = s.get_auth_endpoint(constants.STORAGE_AUTH_ENDPOINT) self.assertEqual('https://storage.azure.com/', result) - # this seems to be failing on windows ci infra - # https://github.com/cloud-custodian/cloud-custodian/runs/3506742597 - @patch('c7n_azure.utils.C7nRetryPolicy.__init__', return_value=None) + @patch('c7n_azure.session.C7nRetryPolicy.__init__', return_value=None) def test_retry_policy_override(self, c7n_retry): s = Session() s.client('azure.mgmt.compute.ComputeManagementClient') From 8696ebaae2014d4b52a1bf73c920e9d6cf1198af Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Sun, 5 Sep 2021 09:25:12 -0700 Subject: [PATCH 4/4] mock --- tools/c7n_azure/tests_azure/test_session.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/c7n_azure/tests_azure/test_session.py b/tools/c7n_azure/tests_azure/test_session.py index d132a51ce65..e10e67f5826 100644 --- a/tools/c7n_azure/tests_azure/test_session.py +++ b/tools/c7n_azure/tests_azure/test_session.py @@ -3,7 +3,6 @@ import json import os import re -import sys import pytest from adal import AdalError @@ -32,7 +31,6 @@ class SessionTest(BaseTest): 'data', 'test_auth_file_no_sub.json') - def mock_init(self, client_id, secret, tenant, resource): pass