Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remote files test #4443

Merged
merged 2 commits into from
Mar 14, 2022
Merged

Remote files test #4443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f12954f
updated test assets
Mar 11, 2022
31d5c51
added test
Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions tests/rest_api/assets/annotations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
],
"tags": [],
"tracks": [],
"version": 3
"version": 0
},
"2": {
"shapes": [
Expand Down Expand Up @@ -292,7 +292,7 @@
],
"tags": [],
"tracks": [],
"version": 3
"version": 0
},
"3": {
"shapes": [
Expand Down Expand Up @@ -327,7 +327,7 @@
],
"tags": [],
"tracks": [],
"version": 6
"version": 0
},
"4": {
"shapes": [
Expand Down Expand Up @@ -449,7 +449,7 @@
],
"tags": [],
"tracks": [],
"version": 6
"version": 0
},
"5": {
"shapes": [],
Expand Down Expand Up @@ -1460,7 +1460,7 @@
],
"tags": [],
"tracks": [],
"version": 3
"version": 0
},
"7": {
"shapes": [
Expand Down Expand Up @@ -1493,7 +1493,7 @@
],
"tags": [],
"tracks": [],
"version": 3
"version": 0
},
"8": {
"shapes": [],
Expand Down Expand Up @@ -1528,7 +1528,7 @@
],
"tags": [],
"tracks": [],
"version": 3
"version": 0
}
}
}
Binary file modified tests/rest_api/assets/cvat_data.tar.bz2
View file
Open in desktop
Binary file not shown.
13 changes: 9 additions & 4 deletions tests/rest_api/assets/cvat_db/cvat_db.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2652,7 +2652,7 @@ COPY public.auth_user (id, password, last_login, is_superuser, username, first_n
11 pbkdf2_sha256$260000$Zw76ANIvIsDngZGsTv2G8O$piTVoqHrpTskW8rI1FBT9rzM2dcpjhrcOfI3pDgtjbo= 2022-02-21 10:29:16.518442+00 f business2 Business Second business2@cvat.org f t 2021-12-14 18:34:01+00
19 pbkdf2_sha256$260000$sKpnXRfALvvS3bBUj8e2SD$wcq2zoyeXxa+gnn6007p6DGtNd+ND6H4pGOq9ekb9t0= \N f user5 User Fifth user5@cvat.org f t 2022-02-24 20:45:07+00
20 pbkdf2_sha256$260000$V3cCtaea9FrYFYQRGJfBGO$nZVdhgyq1iEcv3Ed4QDnMt18ULQViJn0snZDm9ZL2SA= \N f user6 User Sixth user6@cvat.org f t 2022-02-24 20:45:19+00
1 pbkdf2_sha256$260000$DevmxlmLwciP1P6sZs2Qag$U9DFtjTWx96Sk95qY6UXVcvpdQEP2LcoFBftk5D2RKY= 2022-02-24 21:25:06.462854+00 t admin1 Admin First admin1@cvat.org t t 2021-12-14 18:04:57+00
1 pbkdf2_sha256$260000$DevmxlmLwciP1P6sZs2Qag$U9DFtjTWx96Sk95qY6UXVcvpdQEP2LcoFBftk5D2RKY= 2022-03-11 11:18:43.931009+00 t admin1 Admin First admin1@cvat.org t t 2021-12-14 18:04:57+00
\.


Expand Down Expand Up @@ -2931,6 +2931,9 @@ khn67dfajnzkr0tlusuyyub011gt0aqb .eJxVjMEOwiAQRP-FsyEsobL16N1vIAvLStVAUtqT8d9tkx
5x9v6r58e4l9if78anupog0ittsq2w3j .eJxVjMEOwiAQRP-FsyEsobL16N1vIAvLStVAUtqT8d9tkx70OPPezFsFWpcS1p7nMLG6KFCn3y5Seua6A35QvTedWl3mKepd0Qft-tY4v66H-3dQqJdt7UU4MedxGKwFh0RoCBFi4niOTsSAHQFA_JaYmI2nTBEdGRRrSX2-CY443A:1nM644:zfo0j_Zkrm04UxrDj8g_nnsXrpWtRzL4oRx3hAdqyqI 2022-03-07 10:37:08.963511+00
gcz795933839j3g0t3rjgmikzkzlwse3 .eJxVjEEOwiAQRe_C2hCmUCgu3XsGMjCDVA1NSrsy3l1JutDtf-_9lwi4byXsjdcwkzgLEKffLWJ6cO2A7lhvi0xL3dY5yq7IgzZ5XYifl8P9OyjYSq-9niK4b6A1cfYZnCUEBGuzZxW1UsnYFBV7A9PAIxlMzmmj8pDdyOL9AfdKOC0:1nNKyv:kkKNWtjON5Uk-FR_FbwNa3oJ8t5PEd-rZ1y8BsRyays 2022-03-10 20:44:57.190131+00
lqzut02cip3i7xxinmal28z3mo302vey .eJxVjEEOwiAQRe_C2hCmUCgu3XsGMjCDVA1NSrsy3l1JutDtf-_9lwi4byXsjdcwkzgLEKffLWJ6cO2A7lhvi0xL3dY5yq7IgzZ5XYifl8P9OyjYSq-9niK4b6A1cfYZnCUEBGuzZxW1UsnYFBV7A9PAIxlMzmmj8pDdyOL9AfdKOC0:1nNLbm:bXtVicsOrZtQ_p4Qr9bOTAmHWYJMHD8_GCUbncB6nzQ 2022-03-10 21:25:06.476016+00
xblm24372p05jzd2y7r2a90t8bmu5yt0 .eJxVjMEOwiAQBf-FsyHAwgIevfsNBMoiVUOT0p6M_64kPej1zcx7sRD3rYa90xrmzM5MstPvluL0oDZAvsd2W_i0tG2dEx8KP2jn1yXT83K4fwc19jpqpXKWKAi0LpTAG0MGyVEELM6SSaScQAXSWCt8QYNWE3wNnTJ4YO8P2cs3MQ:1nSd5B:iomFwI9vXFK47JW2WNz7ScRFJVC5tZNRouIb1J9sqvk 2022-03-25 11:05:17.349187+00
gj1nicgzqkp64oo2jn8d6ff6n3z8asnv .eJxVjMEOwiAQBf-FsyHAwgIevfsNBMoiVUOT0p6M_64kPej1zcx7sRD3rYa90xrmzM5MstPvluL0oDZAvsd2W_i0tG2dEx8KP2jn1yXT83K4fwc19jpqpXKWKAi0LpTAG0MGyVEELM6SSaScQAXSWCt8QYNWE3wNnTJ4YO8P2cs3MQ:1nSd6u:nOqkuJ76JnlbYg11dLbQTg3LP5hk5kHXqnej8Io8XcI 2022-03-25 11:07:04.491318+00
pj1l8oo5mrweox8avmbzmdv7kam6gdzp .eJxVjMEOwiAQBf-FsyHAwgIevfsNBMoiVUOT0p6M_64kPej1zcx7sRD3rYa90xrmzM5MstPvluL0oDZAvsd2W_i0tG2dEx8KP2jn1yXT83K4fwc19jpqpXKWKAi0LpTAG0MGyVEELM6SSaScQAXSWCt8QYNWE3wNnTJ4YO8P2cs3MQ:1nSdIB:3RGvht_Mxap4ax-Njbawze8KDaixzUcSYQcnrHZOMwI 2022-03-25 11:18:43.949283+00
\.


Expand Down Expand Up @@ -3829,6 +3832,7 @@ COPY public.engine_label (id, name, task_id, color, project_id) FROM stdin;
10 car 6 #2080c0 \N
11 cat 7 #6080c0 \N
12 dog 7 #406040 \N
13 Car 8 #2080c0 \N
\.


Expand Down Expand Up @@ -4014,6 +4018,7 @@ COPY public.engine_task (id, name, mode, created_date, updated_date, status, bug
7 task_2_org2 annotation 2022-02-21 10:31:52.429478+00 2022-02-21 10:41:38.540427+00 annotation 11 0 7 11 \N 7 2d 2
3 task1_in_project1 annotation 2021-12-14 19:48:33.089778+00 2022-02-24 21:25:10.697341+00 annotation 10 0 19 50 1 3 2d Train \N
4 task1_in_project2 annotation 2021-12-14 19:55:57.475273+00 2022-02-24 21:32:36.190676+00 annotation 10 0 19 58 2 4 2d train 2
8 task_without_data 2022-03-11 11:18:43.991247+00 2022-03-11 11:18:44.076719+00 annotation 1 \N \N 0 \N \N 2d \N
\.


Expand Down Expand Up @@ -4161,7 +4166,7 @@ SELECT pg_catalog.setval('public.auth_permission_id_seq', 88, true);
-- Name: auth_user_groups_id_seq; Type: SEQUENCE SET; Schema: public; Owner: root
--

SELECT pg_catalog.setval('public.auth_user_groups_id_seq', 51, true);
SELECT pg_catalog.setval('public.auth_user_groups_id_seq', 54, true);


--
Expand Down Expand Up @@ -4273,7 +4278,7 @@ SELECT pg_catalog.setval('public.engine_jobcommit_id_seq', 27, true);
-- Name: engine_label_id_seq; Type: SEQUENCE SET; Schema: public; Owner: root
--

SELECT pg_catalog.setval('public.engine_label_id_seq', 12, true);
SELECT pg_catalog.setval('public.engine_label_id_seq', 13, true);


--
Expand Down Expand Up @@ -4371,7 +4376,7 @@ SELECT pg_catalog.setval('public.engine_serverfile_id_seq', 1, false);
-- Name: engine_task_id_seq; Type: SEQUENCE SET; Schema: public; Owner: root
--

SELECT pg_catalog.setval('public.engine_task_id_seq', 7, true);
SELECT pg_catalog.setval('public.engine_task_id_seq', 8, true);


--
Expand Down
35 changes: 34 additions & 1 deletion tests/rest_api/assets/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,41 @@
{
"count": 7,
"count": 8,
"next": null,
"previous": null,
"results": [
{
"assignee": null,
"bug_tracker": "",
"created_date": "2022-03-11T11:18:43.991247Z",
"dimension": "2d",
"id": 8,
"labels": [
{
"attributes": [],
"color": "#2080c0",
"id": 13,
"name": "Car"
}
],
"mode": "",
"name": "task_without_data",
"organization": null,
"overlap": null,
"owner": {
"first_name": "Admin",
"id": 1,
"last_name": "First",
"url": "http://localhost:8080/api/users/1",
"username": "admin1"
},
"project_id": null,
"segment_size": 0,
"segments": [],
"status": "annotation",
"subset": "",
"updated_date": "2022-03-11T11:18:44.076719Z",
"url": "http://localhost:8080/api/tasks/8"
},
{
"assignee": {
"first_name": "Worker",
Expand Down
2 changes: 1 addition & 1 deletion tests/rest_api/assets/users.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
"is_active": true,
"is_staff": true,
"is_superuser": true,
"last_login": "2022-02-24T21:25:06.462854Z",
"last_login": "2022-03-11T11:18:43.931009Z",
"last_name": "First",
"url": "http://localhost:8080/api/users/1",
"username": "admin1"
Expand Down
2 changes: 1 addition & 1 deletion tests/rest_api/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,4 @@ def find(jobs, users, is_staff):
def filter_jobs_with_shapes(annotations):
def find(jobs):
return list(filter(lambda j: annotations['job'][str(j['id'])]['shapes'], jobs))
return find
return find
57 changes: 57 additions & 0 deletions tests/rest_api/test_remote_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# Copyright (C) 2022 Intel Corporation
#
# SPDX-License-Identifier: MIT

from time import sleep
from http import HTTPStatus
from .utils.config import get_method, post_method


def _post_task_remote_data(username, task_id, resources):
data = {
'remote_files': resources,
'image_quality': 30,
}

return post_method(username, f'tasks/{task_id}/data', data)

def _wait_until_task_is_created(username, task_id):
url = f'tasks/{task_id}/status'

while True:
response = get_method(username, url)
response_json = response.json()
if response_json['state'] == 'Finished' or response_json['state'] == 'Failed':
return response
sleep(1)


class TestGetAnalytics:
task_id = 8
def _test_can_create(self, user, task_id, resources):
response = _post_task_remote_data(user, task_id, resources)
assert response.status_code == HTTPStatus.ACCEPTED

response = _wait_until_task_is_created(user, task_id)
response_json = response.json()
assert response_json['state'] == 'Finished'

def _test_cannot_create(self, user, task_id, resources):
response = _post_task_remote_data(user, task_id, resources)
assert response.status_code == HTTPStatus.ACCEPTED

response = _wait_until_task_is_created(user, task_id)
response_json = response.json()
assert response_json['state'] == 'Failed'

def test_cannot_create(self, find_users):
user = find_users(privilege='admin')[0]['username']
remote_resources = ['http://localhost/favicon.ico']

self._test_cannot_create(user, self.task_id, remote_resources)

def test_can_create(self, find_users):
user = find_users(privilege='admin')[0]['username']
remote_resources = ['https://openvinotoolkit.github.io/cvat/favicons/favicon-32x32.png']

self._test_can_create(user, self.task_id, remote_resources)