From 5b6473716ad4a354eff5d27dc7910ac40cfbca52 Mon Sep 17 00:00:00 2001 From: Attila Papai Date: Tue, 8 Aug 2023 17:57:00 +0200 Subject: [PATCH 1/3] add adv specific assertion --- tests/integration/test_data_rows.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/integration/test_data_rows.py b/tests/integration/test_data_rows.py index 13123867c..600349f57 100644 --- a/tests/integration/test_data_rows.py +++ b/tests/integration/test_data_rows.py @@ -475,19 +475,26 @@ def create_data_row(data_rows): CUSTOM_TEXT_SCHEMA_NAME].uid -def test_create_data_rows_with_invalid_metadata(dataset, image_url): +def test_create_data_rows_with_invalid_metadata(dataset, image_url, + is_adv_enabled): fields = make_metadata_fields() # make the payload invalid by providing the same schema id more than once fields.append( - DataRowMetadataField(schema_id=TEXT_SCHEMA_ID, value='some msg')) + DataRowMetadataField(schema_id=TEXT_SCHEMA_ID, value="some msg")) task = dataset.create_data_rows([{ DataRow.row_data: image_url, DataRow.metadata_fields: fields }]) task.wait_till_done() - assert task.status == "FAILED" - assert len(task.failed_data_rows) > 0 + if is_adv_enabled: + assert task.status == "COMPLETE" + assert len(task.failed_data_rows) == 1 + assert "Failed to validate the metadata" in task.failed_data_rows[0][ + "message"] + else: + assert task.status == "FAILED" + assert len(task.failed_data_rows) > 0 def test_create_data_rows_with_metadata_missing_value(dataset, image_url): From 901e424e45580751cadadea794c5f852ce87162e Mon Sep 17 00:00:00 2001 From: Attila Papai Date: Thu, 10 Aug 2023 17:49:45 +0200 Subject: [PATCH 2/3] fix assert for adv error message --- tests/integration/test_data_rows.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/integration/test_data_rows.py b/tests/integration/test_data_rows.py index 600349f57..51b0ccc01 100644 --- a/tests/integration/test_data_rows.py +++ b/tests/integration/test_data_rows.py @@ -486,12 +486,13 @@ def test_create_data_rows_with_invalid_metadata(dataset, image_url, DataRow.row_data: image_url, DataRow.metadata_fields: fields }]) - task.wait_till_done() + task.wait_till_done(timeout_seconds=60) if is_adv_enabled: assert task.status == "COMPLETE" assert len(task.failed_data_rows) == 1 - assert "Failed to validate the metadata" in task.failed_data_rows[0][ - "message"] + print(task.failed_data_rows[0]) + assert f"A schemaId can only be specified once per DataRow : [{TEXT_SCHEMA_ID}]" in task.failed_data_rows[ + 0]["message"] else: assert task.status == "FAILED" assert len(task.failed_data_rows) > 0 From 9acebd16dcbe6fe8890ecc5079f003fbf68daff5 Mon Sep 17 00:00:00 2001 From: Attila Papai Date: Fri, 11 Aug 2023 19:35:02 +0200 Subject: [PATCH 3/3] remove print --- tests/integration/test_data_rows.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/test_data_rows.py b/tests/integration/test_data_rows.py index 51b0ccc01..2ca6c110d 100644 --- a/tests/integration/test_data_rows.py +++ b/tests/integration/test_data_rows.py @@ -490,7 +490,6 @@ def test_create_data_rows_with_invalid_metadata(dataset, image_url, if is_adv_enabled: assert task.status == "COMPLETE" assert len(task.failed_data_rows) == 1 - print(task.failed_data_rows[0]) assert f"A schemaId can only be specified once per DataRow : [{TEXT_SCHEMA_ID}]" in task.failed_data_rows[ 0]["message"] else: