From 767c110ad6fc266f0ed89fdf36ac69121bcbbdda Mon Sep 17 00:00:00 2001 From: William Bergamin Date: Thu, 13 Mar 2025 13:18:33 -0400 Subject: [PATCH 1/3] test: add tests around the logger experience of bolt --- .../test_web_client_customization.py | 20 +++++++++++++++++++ .../test_web_client_customization.py | 15 ++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/tests/scenario_tests/test_web_client_customization.py b/tests/scenario_tests/test_web_client_customization.py index 3967ccb7a..1f4a1b80c 100644 --- a/tests/scenario_tests/test_web_client_customization.py +++ b/tests/scenario_tests/test_web_client_customization.py @@ -1,4 +1,5 @@ import json +import logging from time import time from urllib.parse import quote @@ -21,6 +22,7 @@ class TestWebClientCustomization: signing_secret = "secret" mock_api_server_base_url = "http://localhost:8888" signature_verifier = SignatureVerifier(signing_secret) + test_logger = logging.getLogger("test.logger") web_client = WebClient( token=valid_token, base_url=mock_api_server_base_url, @@ -69,6 +71,24 @@ def listener(ack, client): assert response.body == "" assert_auth_test_count(self, 1) + def test_web_client_logger_is_default_app_logger(self): + app = App(token=self.valid_token, signing_secret=self.signing_secret, token_verification_enabled=False) + app.client.base_url = self.mock_api_server_base_url + + assert app.client.logger == app.logger + + def test_web_client_logger_is_app_logger(self): + app = App( + token=self.valid_token, + signing_secret=self.signing_secret, + logger=self.test_logger, + token_verification_enabled=False, + ) + app.client.base_url = self.mock_api_server_base_url + + assert app.client.logger == app.logger + assert app.client.logger == self.test_logger + block_actions_body = { "type": "block_actions", diff --git a/tests/scenario_tests_async/test_web_client_customization.py b/tests/scenario_tests_async/test_web_client_customization.py index 3cfc5af64..ce041b996 100644 --- a/tests/scenario_tests_async/test_web_client_customization.py +++ b/tests/scenario_tests_async/test_web_client_customization.py @@ -1,4 +1,5 @@ import json +import logging import os from time import time from urllib.parse import quote @@ -23,6 +24,7 @@ class TestWebClientCustomization: signing_secret = "secret" mock_api_server_base_url = "http://localhost:8888" signature_verifier = SignatureVerifier(signing_secret) + test_logger = logging.getLogger("test.logger") web_client = AsyncWebClient( token=valid_token, base_url=mock_api_server_base_url, @@ -87,6 +89,19 @@ async def listener(ack, client): assert response.body == "" await assert_auth_test_count_async(self, 1) + def test_web_client_logger_is_default_app_logger(self): + app = AsyncApp(token=self.valid_token, signing_secret=self.signing_secret) + app.client.base_url = self.mock_api_server_base_url + + assert app.client.logger == app.logger + + def test_web_client_logger_is_app_logger(self): + app = AsyncApp(token=self.valid_token, signing_secret=self.signing_secret, logger=self.test_logger) + app.client.base_url = self.mock_api_server_base_url + + assert app.client.logger == app.logger + assert app.client.logger == self.test_logger + block_actions_body = { "type": "block_actions", From 632d22a724c8d9bd9ff1d9e638120ced16a4522f Mon Sep 17 00:00:00 2001 From: William Bergamin Date: Thu, 13 Mar 2025 13:32:32 -0400 Subject: [PATCH 2/3] clean things up --- tests/scenario_tests/test_web_client_customization.py | 4 ---- tests/scenario_tests_async/test_web_client_customization.py | 4 ---- 2 files changed, 8 deletions(-) diff --git a/tests/scenario_tests/test_web_client_customization.py b/tests/scenario_tests/test_web_client_customization.py index 1f4a1b80c..0a96f39bf 100644 --- a/tests/scenario_tests/test_web_client_customization.py +++ b/tests/scenario_tests/test_web_client_customization.py @@ -73,8 +73,6 @@ def listener(ack, client): def test_web_client_logger_is_default_app_logger(self): app = App(token=self.valid_token, signing_secret=self.signing_secret, token_verification_enabled=False) - app.client.base_url = self.mock_api_server_base_url - assert app.client.logger == app.logger def test_web_client_logger_is_app_logger(self): @@ -84,8 +82,6 @@ def test_web_client_logger_is_app_logger(self): logger=self.test_logger, token_verification_enabled=False, ) - app.client.base_url = self.mock_api_server_base_url - assert app.client.logger == app.logger assert app.client.logger == self.test_logger diff --git a/tests/scenario_tests_async/test_web_client_customization.py b/tests/scenario_tests_async/test_web_client_customization.py index ce041b996..fed81bd1a 100644 --- a/tests/scenario_tests_async/test_web_client_customization.py +++ b/tests/scenario_tests_async/test_web_client_customization.py @@ -91,14 +91,10 @@ async def listener(ack, client): def test_web_client_logger_is_default_app_logger(self): app = AsyncApp(token=self.valid_token, signing_secret=self.signing_secret) - app.client.base_url = self.mock_api_server_base_url - assert app.client.logger == app.logger def test_web_client_logger_is_app_logger(self): app = AsyncApp(token=self.valid_token, signing_secret=self.signing_secret, logger=self.test_logger) - app.client.base_url = self.mock_api_server_base_url - assert app.client.logger == app.logger assert app.client.logger == self.test_logger From 8820dde3fa7c3478ecfa9462cd5c2520cc5d2fcb Mon Sep 17 00:00:00 2001 From: William Bergamin Date: Thu, 13 Mar 2025 13:45:47 -0400 Subject: [PATCH 3/3] tmp fix --- tests/scenario_tests/test_web_client_customization.py | 6 +++--- tests/scenario_tests_async/test_web_client_customization.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/scenario_tests/test_web_client_customization.py b/tests/scenario_tests/test_web_client_customization.py index 0a96f39bf..3caf536e3 100644 --- a/tests/scenario_tests/test_web_client_customization.py +++ b/tests/scenario_tests/test_web_client_customization.py @@ -73,7 +73,7 @@ def listener(ack, client): def test_web_client_logger_is_default_app_logger(self): app = App(token=self.valid_token, signing_secret=self.signing_secret, token_verification_enabled=False) - assert app.client.logger == app.logger + assert app.client._logger == app.logger # TODO: use client.logger when available def test_web_client_logger_is_app_logger(self): app = App( @@ -82,8 +82,8 @@ def test_web_client_logger_is_app_logger(self): logger=self.test_logger, token_verification_enabled=False, ) - assert app.client.logger == app.logger - assert app.client.logger == self.test_logger + assert app.client._logger == app.logger # TODO: use client.logger when available + assert app.client._logger == self.test_logger # TODO: use client.logger when available block_actions_body = { diff --git a/tests/scenario_tests_async/test_web_client_customization.py b/tests/scenario_tests_async/test_web_client_customization.py index fed81bd1a..fd95ed5a8 100644 --- a/tests/scenario_tests_async/test_web_client_customization.py +++ b/tests/scenario_tests_async/test_web_client_customization.py @@ -91,12 +91,12 @@ async def listener(ack, client): def test_web_client_logger_is_default_app_logger(self): app = AsyncApp(token=self.valid_token, signing_secret=self.signing_secret) - assert app.client.logger == app.logger + assert app.client._logger == app.logger # TODO: use client.logger when available def test_web_client_logger_is_app_logger(self): app = AsyncApp(token=self.valid_token, signing_secret=self.signing_secret, logger=self.test_logger) - assert app.client.logger == app.logger - assert app.client.logger == self.test_logger + assert app.client._logger == app.logger # TODO: use client.logger when available + assert app.client._logger == self.test_logger # TODO: use client.logger when available block_actions_body = {