Merge branch 'dev' into dependabot/pip/pylint-3.0.0

bachya · Oct 5, 2023 · a86e2a7 · a86e2a7
2 parents 710f8d8 + a53b90c
commit a86e2a7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -182,7 +182,7 @@ async def test_load_local_http_error(aresponses: ResponsesMockServer) -> None:
     ],
 )
 async def test_load_local_other_errors(exc: type[Exception]) -> None:
-    """Test loading a local controller and encounting a non-HTTP issue."""
+    """Test loading a local controller and encountering a non-HTTP issue."""
     async with aiohttp.ClientSession() as session:
         client = Client(session=session)
         with patch.object(client._session, "request", side_effect=exc), pytest.raises(