[DOP-23620] Fix unit tests

Author: dolfinus

syncmaster/db/models/run.py

@@ -41,12 +41,12 @@ class Run(Base, TimestampMixin):
         index=True,
     )
     started_at: Mapped[datetime | None] = mapped_column(
-        DateTime,
+        DateTime(timezone=True),
         nullable=True,
         default=None,
     )
     ended_at: Mapped[datetime | None] = mapped_column(
-        DateTime,
+        DateTime(timezone=True),
         nullable=True,
         default=None,
     )

syncmaster/schemas/v1/connections/connection_base.py

@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2023-2024 MTS PJSC
 # SPDX-License-Identifier: Apache-2.0
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from syncmaster.schemas.v1.auth import ReadBasicAuthSchema, ReadS3AuthSchema
 from syncmaster.schemas.v1.auth.samba import ReadSambaAuthSchema
@@ -14,13 +14,17 @@ class CreateConnectionBaseSchema(BaseModel):
     name: NameConstr = Field(..., description="Connection name")  # noqa: F722
     description: str = Field(..., description="Additional description")
 
+    model_config = ConfigDict(populate_by_name=True)
+
 
 class ReadConnectionBaseSchema(BaseModel):
     id: int
     group_id: int
     name: str
     description: str
 
+    model_config = ConfigDict(populate_by_name=True)
+
 
 class ReadAuthDataSchema(BaseModel):
     auth_data: ReadConnectionAuthDataSchema = Field(discriminator="type", default=...)

syncmaster/schemas/v1/transfers/__init__.py

@@ -4,7 +4,7 @@
 
 from typing import Annotated
 
-from pydantic import BaseModel, Field, model_validator
+from pydantic import BaseModel, ConfigDict, Field, model_validator
 
 from syncmaster.schemas.v1.connection_types import FILE_CONNECTION_TYPES
 from syncmaster.schemas.v1.connections.connection import ReadConnectionSchema
@@ -159,23 +159,20 @@ class ReadTransferSchema(BaseModel):
     schedule: str
     queue_id: int
     source_params: ReadTransferSchemaSource = Field(
-        ...,
         discriminator="type",
     )
     target_params: ReadTransferSchemaTarget = Field(
-        ...,
         discriminator="type",
     )
     strategy_params: FullStrategy | IncrementalStrategy = Field(
-        ...,
         discriminator="type",
     )
-    transformations: list[Annotated[TransformationSchema, Field(..., discriminator="type")]] = Field(
+    transformations: list[Annotated[TransformationSchema, Field(discriminator="type")]] = Field(
         default_factory=list,
     )
-    resources: Resources = Field(
-        ...,
-    )
+    resources: Resources
+
+    model_config = ConfigDict(from_attributes=True)
 
 
 class CreateTransferSchema(BaseModel):

syncmaster/schemas/v1/transfers/file/base.py

@@ -90,7 +90,7 @@ def _validate_file_name_template(cls, value: str) -> str:  # noqa: WPS238
 
         missing_keys = sorted(required_keys - placeholders)
         if missing_keys:
-            missing_keys_str = " ".join(missing_keys)
+            missing_keys_str = ", ".join(missing_keys)
             raise ValueError(f"Missing required placeholders: {missing_keys_str}")
 
         if "{run_id}" not in value and "{run_created_at}" not in value:

syncmaster/schemas/v1/transfers/run.py

@@ -4,7 +4,7 @@
 
 from datetime import datetime
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 from syncmaster.db.models import RunType, Status
 from syncmaster.schemas.v1.page import PageSchema
@@ -19,6 +19,8 @@ class ShortRunSchema(BaseModel):
     log_url: str | None = None
     type: RunType
 
+    model_config = ConfigDict(from_attributes=True)
+
 
 class RunPageSchema(PageSchema):
     items: list[ShortRunSchema]

syncmaster/schemas/v1/users.py

@@ -24,6 +24,8 @@ class ReadUserSchema(BaseModel):
     username: str
     is_superuser: bool
 
+    model_config = ConfigDict(from_attributes=True)
+
 
 class FullUserSchema(ReadGroupMember):
     is_active: bool

syncmaster/server/api/v1/runs.py

@@ -76,7 +76,7 @@ async def read_run(
     if resource_role == Permission.NONE:
         raise TransferNotFoundError
 
-    return ReadRunSchema.model_validate(run, from_attributes=True)
+    return ReadRunSchema.model_validate(run)
 
 
 @router.post("/runs")
@@ -134,7 +134,7 @@ async def start_run(  # noqa: WPS217
                 status=Status.FAILED,
             )
         raise CannotConnectToTaskQueueError(run_id=run.id) from e
-    return ReadRunSchema.model_validate(run, from_attributes=True)
+    return ReadRunSchema.model_validate(run)
 
 
 @router.post("/runs/{run_id}/stop")
@@ -160,4 +160,4 @@ async def stop_run(
     async with unit_of_work:
         run = await unit_of_work.run.stop(run_id=run_id)
         # TODO: add immediate stop transfer after stop Run
-    return ReadRunSchema.model_validate(run, from_attributes=True)
+    return ReadRunSchema.model_validate(run)

tests/utils.py

@@ -1,6 +1,6 @@
 import asyncio
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any
 
@@ -112,7 +112,7 @@ async def get_run_on_end(
     token: str,
     timeout: int = 120,
 ) -> dict[str, Any]:
-    end_time = datetime.now().timestamp() + timeout
+    end_time = datetime.now(tz=timezone.utc).timestamp() + timeout
     while True:
         logger.info("Waiting for end of run")
         result = await client.get(
@@ -126,7 +126,7 @@ async def get_run_on_end(
         if data["status"] in [Status.FINISHED, Status.FAILED]:
             return data
 
-        if datetime.now().timestamp() > end_time:
+        if datetime.now(tz=timezone.utc).timestamp() > end_time:
             raise TimeoutError()
 
         await asyncio.sleep(1)
@@ -163,8 +163,7 @@ async def run_transfer_and_verify(
         headers={"Authorization": f"Bearer {user.token}"},
         json={"transfer_id": transfer_id},
     )
-    assert result.status_code == 200
-
+    assert result.status_code == 200, result.json()
     run_data = await get_run_on_end(
         client=client,
         run_id=result.json()["id"],