From ee73d6bf329fa98754b5c524b31d0bd8cf3636eb Mon Sep 17 00:00:00 2001 From: Mike Degatano Date: Wed, 29 Jan 2025 15:19:36 +0000 Subject: [PATCH] Make job id a proper UUID in response model --- aiohasupervisor/models/backups.py | 3 ++- tests/test_backups.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/aiohasupervisor/models/backups.py b/aiohasupervisor/models/backups.py index 95de892..c532f3e 100644 --- a/aiohasupervisor/models/backups.py +++ b/aiohasupervisor/models/backups.py @@ -5,6 +5,7 @@ from datetime import datetime from enum import StrEnum from pathlib import PurePath +from uuid import UUID from .base import Options, Request, ResponseData @@ -167,7 +168,7 @@ class PartialBackupOptions(FullBackupOptions, PartialBackupRestoreOptions): class BackupJob(ResponseData): """BackupJob model.""" - job_id: str + job_id: UUID @dataclass(frozen=True, slots=True) diff --git a/tests/test_backups.py b/tests/test_backups.py index 140e8a9..0ae3fd5 100644 --- a/tests/test_backups.py +++ b/tests/test_backups.py @@ -207,7 +207,7 @@ async def test_backups_full_backup( callback=backup_callback, ) result = await supervisor_client.backups.full_backup(options) - assert result.job_id == "dc9dbc16f6ad4de592ffa72c807ca2bf" + assert result.job_id.hex == "dc9dbc16f6ad4de592ffa72c807ca2bf" assert result.slug == slug @@ -280,7 +280,7 @@ async def test_backups_partial_backup( callback=backup_callback, ) result = await supervisor_client.backups.partial_backup(options) - assert result.job_id == "dc9dbc16f6ad4de592ffa72c807ca2bf" + assert result.job_id.hex == "dc9dbc16f6ad4de592ffa72c807ca2bf" assert result.slug == slug @@ -401,7 +401,7 @@ async def test_full_restore( body=load_fixture("backup_restore.json"), ) result = await supervisor_client.backups.full_restore("abc123", options) - assert result.job_id == "dc9dbc16f6ad4de592ffa72c807ca2bf" + assert result.job_id.hex == "dc9dbc16f6ad4de592ffa72c807ca2bf" @pytest.mark.parametrize( @@ -426,7 +426,7 @@ async def test_partial_restore( body=load_fixture("backup_restore.json"), ) result = await supervisor_client.backups.partial_restore("abc123", options) - assert result.job_id == "dc9dbc16f6ad4de592ffa72c807ca2bf" + assert result.job_id.hex == "dc9dbc16f6ad4de592ffa72c807ca2bf" @pytest.mark.parametrize(