Skip to content

[AL-6929] adjust ADV specific asserts #1216

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

Merged
merged 2 commits into from
Aug 21, 2023
Merged

[AL-6929] adjust ADV specific asserts #1216

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
00df56c
adjust ADV specific asserts
attila-papai Aug 19, 2023
ffdae57
Merge branch 'develop' into attila/AL-6929-gk-tests
attila-papai Aug 19, 2023
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
1 change: 1 addition & 0 deletions tests/integration/test_data_rows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,7 @@ def test_data_row_bulk_creation_sync_with_same_global_keys(
if is_adv_enabled:
# ADV will import the first data row but not the second (duplicate global key)
assert len(list(dataset.data_rows())) == 1
assert list(dataset.data_rows())[0].global_key == global_key_1
assert "Some data rows were not imported. Check error output here" in str(
exc_info.value)
else:
Expand Down
37 changes: 14 additions & 23 deletions tests/integration/test_global_keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ def test_long_global_key_validation(client, dataset, image_url):
'error'] == 'Invalid assignment. Either DataRow does not exist, or globalKey is invalid'


def test_global_key_with_whitespaces_validation(client, dataset, image_url,
is_adv_enabled):
def test_global_key_with_whitespaces_validation(client, dataset, image_url):
dr_1 = dataset.create_data_row(row_data=image_url)
dr_2 = dataset.create_data_row(row_data=image_url)
dr_3 = dataset.create_data_row(row_data=image_url)
Expand All @@ -138,27 +137,19 @@ def test_global_key_with_whitespaces_validation(client, dataset, image_url,
}]
res = client.assign_global_keys_to_data_rows(assignment_inputs)

if is_adv_enabled:
assert res['status'] == 'PARTIAL SUCCESS'
assert len(res['results']) == 2
assert len(res['errors']) == 1
assert res['errors'][0]['global_key'] == gk_3
assert res['errors'][0][
'error'] == "Invalid assignment. Either DataRow does not exist, or globalKey is invalid"
else:
assert len(res['results']) == 0
assert len(res['errors']) == 3
assert res['status'] == 'FAILURE'
assign_errors_ids = set([e['data_row_id'] for e in res['errors']])
assign_errors_gks = set([e['global_key'] for e in res['errors']])
assign_errors_msgs = set([e['error'] for e in res['errors']])
assert assign_errors_ids == set([dr_1.uid, dr_2.uid, dr_3.uid])
assert assign_errors_gks == set([gk_1, gk_2, gk_3])
assert assign_errors_msgs == set([
'Invalid assignment. Either DataRow does not exist, or globalKey is invalid',
'Invalid assignment. Either DataRow does not exist, or globalKey is invalid',
'Invalid assignment. Either DataRow does not exist, or globalKey is invalid'
])
assert len(res['results']) == 0
assert len(res['errors']) == 3
assert res['status'] == 'FAILURE'
assign_errors_ids = set([e['data_row_id'] for e in res['errors']])
assign_errors_gks = set([e['global_key'] for e in res['errors']])
assign_errors_msgs = set([e['error'] for e in res['errors']])
assert assign_errors_ids == set([dr_1.uid, dr_2.uid, dr_3.uid])
assert assign_errors_gks == set([gk_1, gk_2, gk_3])
assert assign_errors_msgs == set([
'Invalid assignment. Either DataRow does not exist, or globalKey is invalid',
'Invalid assignment. Either DataRow does not exist, or globalKey is invalid',
'Invalid assignment. Either DataRow does not exist, or globalKey is invalid'
])


def test_get_data_row_ids_for_global_keys(client, dataset, image_url):
Expand Down