Merge branch '21659-gh-workflow-tests' into main. Closes #21659

[arvados.git] / sdk / python / tests / test_api.py

diff --git a/sdk/python/tests/test_api.py b/sdk/python/tests/test_api.py
index 65d804ebb1f18981dac557dd9a032a186cd3780c..0f85e5520c821dcaa7bf6690e7702cb857e3ac54 100644 (file)
--- a/sdk/python/tests/test_api.py
+++ b/sdk/python/tests/test_api.py
@@ -402,13 +402,11 @@ class ArvadosApiTest(run_test_server.TestCaseWithServers):
             pass
         real_logger = logging.getLogger('googleapiclient.http')
         mock_logger = mock.Mock(wraps=real_logger)
-        mock_logger.hasHandlers.return_value = False
+        mock_logger.handlers = logging.getLogger('googleapiclient').handlers
         mock_logger.level = logging.NOTSET
-        with (
-                mock.patch('logging.getLogger', return_value=mock_logger),
-                mock.patch('time.sleep'),
-                self.assertLogs(real_logger, 'INFO') as actual_logs,
-        ):
+        with mock.patch('logging.getLogger', return_value=mock_logger), \
+             mock.patch('time.sleep'), \
+             self.assertLogs(real_logger, 'INFO') as actual_logs:
             try:
                 api_client('v1', 'https://test.invalid/', 'NoToken', num_retries=1)
             except httplib2.error.ServerNotFoundError:
@@ -423,11 +421,9 @@ class ArvadosApiTest(run_test_server.TestCaseWithServers):
     def test_configured_logger_untouched(self):
         real_logger = logging.getLogger('googleapiclient.http')
         mock_logger = mock.Mock(wraps=real_logger)
-        mock_logger.hasHandlers.return_value = True
-        with (
-                mock.patch('logging.getLogger', return_value=mock_logger),
-                mock.patch('time.sleep'),
-        ):
+        mock_logger.handlers = logging.getLogger().handlers
+        with mock.patch('logging.getLogger', return_value=mock_logger), \
+             mock.patch('time.sleep'):
             try:
                 api_client('v1', 'https://test.invalid/', 'NoToken', num_retries=1)
             except httplib2.error.ServerNotFoundError: