Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into honnor-passing-bolt-logger-in-default-web-cl…
…ient-installation
  • Loading branch information
WilliamBergamin committed Mar 14, 2025
commit 1ba23f07cbd8e26c32011fc5a046cc5af067be8e
19 changes: 15 additions & 4 deletions tests/scenario_tests/test_web_client_customization.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ class TestWebClientCustomization:
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)
web_client = WebClient(
token=valid_token,
base_url=mock_api_server_base_url,
)

def setup_method(self):
self.old_os_env = remove_os_env_temporarily()
Expand Down Expand Up @@ -68,11 +71,19 @@ def listener(ack, client):
assert response.body == ""
assert_auth_test_count(self, 1)

def test_default_app_web_client_logger_is_app_logger(self):
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 # TODO: use client.logger when available

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,
)
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

def test_default_web_client_uses_bolt_framework_logger(self):
app = App(token=self.valid_token, signing_secret=self.signing_secret, token_verification_enabled=False)
Expand Down
9 changes: 6 additions & 3 deletions tests/scenario_tests_async/test_web_client_customization.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,14 @@ async def listener(ack, client):
assert response.body == ""
await assert_auth_test_count_async(self, 1)

def test_default_app_web_client_logger_is_app_logger(self):
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 # TODO: use client.logger when available

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)
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

@pytest.mark.asyncio
async def test_default_web_client_uses_bolt_framework_logger(self):
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.