[DOP-21350] revert some commits

Author: Ilyas Gasanov

.github/workflows/scheduler-tests.yml

@@ -49,7 +49,7 @@ jobs:
       # This is important, as coverage is exported after receiving SIGTERM
       - name: Run Scheduler Tests
         run: |
-          docker compose -f ./docker-compose.test.yml --profile worker exec -T worker coverage run -m pytest -vvv -s -m "scheduler"
+          docker compose -f ./docker-compose.test.yml --profile worker exec -T worker coverage run -m pytest -vvv -s -m "worker and scheduler_integration"
 
       - name: Dump worker logs on failure
         if: failure()

…t_integration/test_scheduler/fixtures.py …t_integration/test_scheduler/conftest.pytests/test_integration/test_scheduler/fixtures.py renamed to tests/test_integration/test_scheduler/conftest.py tests/test_integration/test_scheduler/fixtures.py renamed to tests/test_integration/test_scheduler/conftest.py

@@ -9,7 +9,7 @@
 from syncmaster.settings import Settings
 from tests.mocks import MockTransfer
 
-pytestmark = [pytest.mark.asyncio, pytest.mark.worker]
+pytestmark = [pytest.mark.asyncio, pytest.mark.worker, pytest.mark.scheduler_integration]
 
 
 async def test_scheduler(
@@ -38,8 +38,12 @@ async def test_scheduler(
     assert run is not None
     assert run.status in [Status.CREATED, Status.STARTED]
 
-    await asyncio.sleep(2)
-    await session.refresh(run)
-    completed_run = await session.scalar(select(Run).filter_by(id=run.id))
-    assert completed_run.status == Status.FINISHED
-    assert completed_run.ended_at is not None
+    for _ in range(3):
+        await asyncio.sleep(2)
+        await session.refresh(run)
+        run = await session.scalar(select(Run, run.id))
+        if run.status == Status.FINISHED:
+            break
+
+    assert run.status == Status.FINISHED
+    assert run.ended_at is not None