Skip to content

Commit 2977870

Browse files
committed
still to be fixed
1 parent 4cdf189 commit 2977870

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

services/storage/tests/conftest.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@
6565
from simcore_service_storage.datcore_dsm import DatCoreDataManager
6666
from simcore_service_storage.dsm import get_dsm_provider
6767
from simcore_service_storage.models import FileMetaData, FileMetaDataAtDB, S3BucketName
68-
from simcore_service_storage.modules.long_running_tasks import (
69-
get_completed_upload_tasks,
70-
)
7168
from simcore_service_storage.modules.s3 import get_s3_client
7269
from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
7370
from sqlalchemy import literal_column
@@ -503,8 +500,8 @@ async def _directory_creator(
503500
assert file_upload_complete_response
504501
state_url = URL(f"{file_upload_complete_response.links.state}").relative()
505502

506-
# check that it finished updating
507-
get_completed_upload_tasks(initialized_app).clear()
503+
# check that it finished updating TODO: this works via celery now
504+
# get_completed_upload_tasks(initialized_app).clear()
508505
# now check for the completion
509506
async for attempt in AsyncRetrying(
510507
reraise=True,

services/storage/tests/unit/test_handlers_files.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@
5555
from servicelib.aiohttp import status
5656
from simcore_service_storage.constants import S3_UNDEFINED_OR_EXTERNAL_MULTIPART_ID
5757
from simcore_service_storage.models import FileDownloadResponse, S3BucketName, UploadID
58-
from simcore_service_storage.modules.long_running_tasks import (
59-
get_completed_upload_tasks,
60-
)
6158
from simcore_service_storage.simcore_s3_dsm import SimcoreS3DataManager
6259
from sqlalchemy.ext.asyncio import AsyncEngine
6360
from tenacity.asyncio import AsyncRetrying
@@ -682,8 +679,8 @@ async def test_upload_real_file_with_emulated_storage_restart_after_completion_w
682679
assert file_upload_complete_response
683680
state_url = URL(f"{file_upload_complete_response.links.state}").relative()
684681

685-
# here we do not check now for the state completion. instead we simulate a restart where the tasks disappear
686-
get_completed_upload_tasks(initialized_app).clear()
682+
# # here we do not check now for the state completion. instead we simulate a restart where the tasks disappear TODO: fix
683+
# get_completed_upload_tasks(initialized_app).clear()
687684
# now check for the completion
688685
completion_etag = None
689686
async for attempt in AsyncRetrying(

0 commit comments

Comments
 (0)