Skip to content

Commit 30f84dc

Browse files
committed
[Ex oracle] Fix test
1 parent 6e286f5 commit 30f84dc

File tree

4 files changed

+34
-12
lines changed

4 files changed

+34
-12
lines changed

packages/examples/cvat/exchange-oracle/poetry.lock

Lines changed: 23 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/examples/cvat/exchange-oracle/src/handlers/job_creation.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,7 @@ def build(self):
345345
self._upload_task_meta(gt_dataset)
346346

347347
# Register cloud storage on CVAT to pass user dataset
348-
_params = _make_cvat_cloud_storage_params(data_bucket)
349-
_params["bucket_host"] = "http://minio:9010"
350-
cloud_storage = cvat_api.create_cloudstorage(**_params)
348+
cloud_storage = cvat_api.create_cloudstorage(**_make_cvat_cloud_storage_params(data_bucket))
351349

352350
# Create a project
353351
cvat_project = cvat_api.create_project(
@@ -1446,9 +1444,9 @@ def _create_on_cvat(self):
14461444
oracle_bucket = self.oracle_data_bucket
14471445

14481446
# Register cloud storage on CVAT to pass user dataset
1449-
_params = _make_cvat_cloud_storage_params(oracle_bucket)
1450-
_params["bucket_host"] = "http://minio:9010"
1451-
cvat_cloud_storage = cvat_api.create_cloudstorage(**_params)
1447+
cvat_cloud_storage = cvat_api.create_cloudstorage(
1448+
**_make_cvat_cloud_storage_params(oracle_bucket)
1449+
)
14521450

14531451
# Create a project
14541452
cvat_project = cvat_api.create_project(
@@ -2577,9 +2575,9 @@ def _task_params_label_key(ts):
25772575
oracle_bucket = self.oracle_data_bucket
25782576

25792577
# Register cloud storage on CVAT to pass user dataset
2580-
_params = _make_cvat_cloud_storage_params(oracle_bucket)
2581-
_params["bucket_host"] = "http://minio:9010"
2582-
cvat_cloud_storage = cvat_api.create_cloudstorage(**_params)
2578+
cvat_cloud_storage = cvat_api.create_cloudstorage(
2579+
**_make_cvat_cloud_storage_params(oracle_bucket)
2580+
)
25832581

25842582
segment_size = self._task_segment_size
25852583

packages/examples/cvat/exchange-oracle/tests/integration/cron/state_trackers/test_track_task_creation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def test_track_track_completed_task_creation(self):
6060
) as mock_get_task_upload_status,
6161
patch("src.crons.cvat.state_trackers.cvat_api.fetch_task_jobs") as mock_fetch_task_jobs,
6262
):
63-
mock_get_task_upload_status.return_value = (cvat_api.UploadStatus.FINISHED, None)
63+
mock_get_task_upload_status.return_value = (cvat_api.UploadStatus.FINISHED, "Finished")
6464
mock_cvat_job_1 = Mock()
6565
mock_cvat_job_1.id = cvat_job.cvat_id
6666

@@ -100,7 +100,7 @@ def test_track_track_completed_task_creation_error(self):
100100
side_effect=cvat_api.exceptions.ApiException("Error"),
101101
),
102102
):
103-
mock_get_task_upload_status.return_value = (cvat_api.UploadStatus.FINISHED, None)
103+
mock_get_task_upload_status.return_value = (cvat_api.UploadStatus.FINISHED, "Finished")
104104

105105
track_task_creation()
106106

packages/examples/cvat/exchange-oracle/tests/integration/cron/test_process_job_launcher_webhooks.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
process_incoming_job_launcher_webhooks,
2222
process_outgoing_job_launcher_webhooks,
2323
)
24+
from src.cvat.api_calls import UploadStatus
2425
from src.db import SessionLocal
2526
from src.models.cvat import EscrowCreation, Project
2627
from src.models.webhook import Webhook
@@ -79,6 +80,7 @@ def test_process_incoming_job_launcher_webhooks_escrow_created_type(self):
7980

8081
mock_cvat_api.create_cvat_webhook.return_value = mock_cvat_object
8182
mock_cvat_api.create_cloudstorage.return_value = mock_cvat_object
83+
mock_cvat_api.get_task_upload_status.return_value = (UploadStatus.FINISHED, "Finished")
8284

8385
gt_filenames = ["image1.jpg", "image2.png"]
8486
gt_dataset = build_gt_dataset(gt_filenames).encode()

0 commit comments

Comments
 (0)