[AL-6929] adjust ADV specific asserts (#1216)

Author: attila-papai

tests/integration/test_data_rows.py

@@ -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:

tests/integration/test_global_keys.py

@@ -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)
@@ -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):