Mirrored_Repos/python-kasa
1
0
Fork 0
mirror of https://github.com/python-kasa/python-kasa.git synced 2025-04-26 08:36:22 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix tests due to yarl URL str output change (#1112)

Browse Source 
Latest versions of yarl>=1.9.5 omit the port 80 when calling str(url) which broke tests.
This commit is contained in:
Steven B. 2024-09-06 15:27:23 +01:00 committed by GitHub
parent b0d0c4b703
commit 1773f98aad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kasa/tests/test_aestransport.py
View File

@ -460,7 +460,7 @@ class MockAesDevice:
elif json["method"] == "login_device": elif json["method"] == "login_device":
return await self._return_login_response(url, json) return await self._return_login_response(url, json)
else: else:
assert str(url) == f"http://{self.host}:80/app?token={self.token}" assert url == URL(f"http://{self.host}:80/app?token={self.token}")
return await self._return_send_response(url, json) return await self._return_send_response(url, json)
async def _return_handshake_response(self, url: URL, json: dict[str, Any]): async def _return_handshake_response(self, url: URL, json: dict[str, Any]):

16
kasa/tests/test_klapprotocol.py
View File

@ -389,14 +389,14 @@ async def test_handshake(
async def _return_handshake_response(url: URL, params=None, data=None, *_, **__): async def _return_handshake_response(url: URL, params=None, data=None, *_, **__):
nonlocal client_seed, server_seed, device_auth_hash nonlocal client_seed, server_seed, device_auth_hash
if str(url) == "http://127.0.0.1:80/app/handshake1": if url == URL("http://127.0.0.1:80/app/handshake1"):
client_seed = data client_seed = data
seed_auth_hash = _sha256( seed_auth_hash = _sha256(
seed_auth_hash_calc1(client_seed, server_seed, device_auth_hash) seed_auth_hash_calc1(client_seed, server_seed, device_auth_hash)
) )
return _mock_response(200, server_seed + seed_auth_hash) return _mock_response(200, server_seed + seed_auth_hash)
elif str(url) == "http://127.0.0.1:80/app/handshake2": elif url == URL("http://127.0.0.1:80/app/handshake2"):
seed_auth_hash = _sha256( seed_auth_hash = _sha256(
seed_auth_hash_calc2(client_seed, server_seed, device_auth_hash) seed_auth_hash_calc2(client_seed, server_seed, device_auth_hash)
) )
@ -433,14 +433,14 @@ async def test_query(mocker):
async def _return_response(url: URL, params=None, data=None, *_, **__): async def _return_response(url: URL, params=None, data=None, *_, **__):
nonlocal client_seed, server_seed, device_auth_hash, seq nonlocal client_seed, server_seed, device_auth_hash, seq
if str(url) == "http://127.0.0.1:80/app/handshake1": if url == URL("http://127.0.0.1:80/app/handshake1"):
client_seed = data client_seed = data
client_seed_auth_hash = _sha256(data + device_auth_hash) client_seed_auth_hash = _sha256(data + device_auth_hash)
return _mock_response(200, server_seed + client_seed_auth_hash) return _mock_response(200, server_seed + client_seed_auth_hash)
elif str(url) == "http://127.0.0.1:80/app/handshake2": elif url == URL("http://127.0.0.1:80/app/handshake2"):
return _mock_response(200, b"") return _mock_response(200, b"")
elif str(url) == "http://127.0.0.1:80/app/request": elif url == URL("http://127.0.0.1:80/app/request"):
encryption_session = KlapEncryptionSession( encryption_session = KlapEncryptionSession(
protocol._transport._encryption_session.local_seed, protocol._transport._encryption_session.local_seed,
protocol._transport._encryption_session.remote_seed, protocol._transport._encryption_session.remote_seed,
@ -526,7 +526,7 @@ async def test_authentication_failures(
response_status, \ response_status, \
credentials_match credentials_match
if str(url) == "http://127.0.0.1:80/app/handshake1": if url == URL("http://127.0.0.1:80/app/handshake1"):
client_seed = data client_seed = data
client_seed_auth_hash = _sha256(data + device_auth_hash) client_seed_auth_hash = _sha256(data + device_auth_hash)
if credentials_match is not False and credentials_match is not True: if credentials_match is not False and credentials_match is not True:
@ -534,13 +534,13 @@ async def test_authentication_failures(
return _mock_response( return _mock_response(
response_status[0], server_seed + client_seed_auth_hash response_status[0], server_seed + client_seed_auth_hash
) )
elif str(url) == "http://127.0.0.1:80/app/handshake2": elif url == URL("http://127.0.0.1:80/app/handshake2"):
client_seed = data client_seed = data
client_seed_auth_hash = _sha256(data + device_auth_hash) client_seed_auth_hash = _sha256(data + device_auth_hash)
return _mock_response( return _mock_response(
response_status[1], server_seed + client_seed_auth_hash response_status[1], server_seed + client_seed_auth_hash
) )
elif str(url) == "http://127.0.0.1:80/app/request": elif url == URL("http://127.0.0.1:80/app/request"):
return _mock_response(response_status[2], b"") return _mock_response(response_status[2], b"")
mocker.patch.object(aiohttp.ClientSession, "post", side_effect=_return_response) mocker.patch.object(aiohttp.ClientSession, "post", side_effect=_return_response)