Bump PyJWT to 2.6.0 (#90134)

* Bump PyJWT to 2.6.0

* fix time being frozen too late which makes the access token creation time in the future

* revert zha change

* fix repairs test

* fix ical test
This commit is contained in:
J. Nick Koston 2023-03-22 14:00:47 -10:00 committed by GitHub
parent 03aeaba7ef
commit 99b58f157e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 143 additions and 74 deletions

View file

@ -1,19 +1,46 @@
"""Tests for diagnostics platform of local calendar."""
from aiohttp.test_utils import TestClient
from freezegun import freeze_time
import pytest
from syrupy.assertion import SnapshotAssertion
from homeassistant.auth.models import Credentials
from homeassistant.core import HomeAssistant
from homeassistant.setup import async_setup_component
from .conftest import TEST_ENTITY, ClientFixture
from .conftest import TEST_ENTITY, Client, ClientFixture
from tests.common import MockConfigEntry
from tests.common import CLIENT_ID, MockConfigEntry, MockUser
from tests.components.diagnostics import get_diagnostics_for_config_entry
from tests.typing import ClientSessionGenerator
async def generate_new_hass_access_token(
hass: HomeAssistant, hass_admin_user: MockUser, hass_admin_credential: Credentials
) -> str:
"""Return an access token to access Home Assistant."""
await hass.auth.async_link_user(hass_admin_user, hass_admin_credential)
refresh_token = await hass.auth.async_create_refresh_token(
hass_admin_user, CLIENT_ID, credential=hass_admin_credential
)
return hass.auth.async_create_access_token(refresh_token)
def _get_test_client_generator(
hass: HomeAssistant, aiohttp_client: ClientSessionGenerator, new_token: str
):
"""Return a test client generator.""."""
async def auth_client() -> TestClient:
return await aiohttp_client(
hass.http.app, headers={"Authorization": f"Bearer {new_token}"}
)
return auth_client
@pytest.fixture(autouse=True)
async def setup_diag(hass):
"""Set up diagnostics platform."""
@ -24,12 +51,27 @@ async def setup_diag(hass):
async def test_empty_calendar(
hass: HomeAssistant,
setup_integration: None,
hass_client: ClientSessionGenerator,
hass_admin_user: MockUser,
hass_admin_credential: Credentials,
config_entry: MockConfigEntry,
aiohttp_client: ClientSessionGenerator,
socket_enabled: None,
snapshot: SnapshotAssertion,
) -> None:
"""Test diagnostics against an empty calendar."""
data = await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
# Since we are freezing time only when we enter this test, we need to
# manually create a new token and clients since the token created by
# the fixtures would not be valid.
#
# Ideally we would use pytest.mark.freeze_time before the fixtures, but that does not
# work with the ical library and freezegun because
# `TypeError: '<' not supported between instances of 'FakeDatetimeMeta' and 'FakeDateMeta'`
new_token = await generate_new_hass_access_token(
hass, hass_admin_user, hass_admin_credential
)
data = await get_diagnostics_for_config_entry(
hass, _get_test_client_generator(hass, aiohttp_client, new_token), config_entry
)
assert data == snapshot
@ -37,14 +79,26 @@ async def test_empty_calendar(
async def test_api_date_time_event(
hass: HomeAssistant,
setup_integration: None,
hass_admin_user: MockUser,
hass_admin_credential: Credentials,
config_entry: MockConfigEntry,
hass_client: ClientSessionGenerator,
ws_client: ClientFixture,
hass_ws_client: ClientFixture,
aiohttp_client: ClientSessionGenerator,
socket_enabled: None,
snapshot: SnapshotAssertion,
) -> None:
"""Test an event with a start/end date time."""
client = await ws_client()
# Since we are freezing time only when we enter this test, we need to
# manually create a new token and clients since the token created by
# the fixtures would not be valid.
#
# Ideally we would use pytest.mark.freeze_time before the fixtures, but that does not
# work with the ical library and freezegun because
# `TypeError: '<' not supported between instances of 'FakeDatetimeMeta' and 'FakeDateMeta'`
new_token = await generate_new_hass_access_token(
hass, hass_admin_user, hass_admin_credential
)
client = Client(await hass_ws_client(hass, access_token=new_token))
await client.cmd_result(
"create",
{
@ -58,5 +112,7 @@ async def test_api_date_time_event(
},
)
data = await get_diagnostics_for_config_entry(hass, hass_client, config_entry)
data = await get_diagnostics_for_config_entry(
hass, _get_test_client_generator(hass, aiohttp_client, new_token), config_entry
)
assert data == snapshot