From e70a7dd12ac5a268ec487521b4db29606ccbfc06 Mon Sep 17 00:00:00 2001 From: jhartmann Date: Tue, 28 May 2024 14:05:06 +0200 Subject: [PATCH 1/2] chore(tavern):[#503] Fix ess tavern test for expected tombstones --- local/testing/api-tests/irs-api-tests.tavern.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/local/testing/api-tests/irs-api-tests.tavern.yaml b/local/testing/api-tests/irs-api-tests.tavern.yaml index f4f28cf64a..661f5b66f1 100644 --- a/local/testing/api-tests/irs-api-tests.tavern.yaml +++ b/local/testing/api-tests/irs-api-tests.tavern.yaml @@ -448,9 +448,12 @@ stages: - function: local.testing.api-tests.tavern_helpers:supplyChainImpacted_is_as_expected extra_kwargs: expectedSupplyChainImpacted: "Unknown" - - function: local.testing.api-tests.tavern_helpers:tombstone_for_EssValidation_are_correct + - function: local.testing.api-tests.tavern_helpers:tombstones_have_size + extra_kwargs: + number_of_tombstones: 1 + - function: local.testing.api-tests.tavern_helpers:tombstone_for_ess_validation_is_correct extra_kwargs: - expectedTombstone: "AspectType 'PartSiteInformationAsPlanned' not found in Job." + expected_error_detail: "AspectType 'PartSiteInformationAsPlanned' not found in Job." headers: content-type: application/json @@ -512,7 +515,7 @@ stages: number_of_tombstones: 2 - function: local.testing.api-tests.tavern_helpers:tombstone_for_submodel_validation_is_correct extra_kwargs: - expected_error_detail: "Submodel payload validation failed. $.sites[0]: required property 'catenaXsiteId' not found." + expected_error_detail: "Submodel payload validation failed. $.sites[0]: required property 'catenaXsiteId' not found" - function: local.testing.api-tests.tavern_helpers:tombstone_for_ess_validation_is_correct extra_kwargs: expected_error_detail: "AspectType 'PartSiteInformationAsPlanned' not found in Job." From bb6c6e0c22122a5a8adc49299f3739c3b4c8d8bf Mon Sep 17 00:00:00 2001 From: jhartmann Date: Tue, 28 May 2024 14:05:34 +0200 Subject: [PATCH 2/2] chore(tavern):[#503] Increase tavern job completion polling rate --- local/testing/api-tests/irs-api-tests.tavern.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/local/testing/api-tests/irs-api-tests.tavern.yaml b/local/testing/api-tests/irs-api-tests.tavern.yaml index 661f5b66f1..fd6dd13ec9 100644 --- a/local/testing/api-tests/irs-api-tests.tavern.yaml +++ b/local/testing/api-tests/irs-api-tests.tavern.yaml @@ -67,7 +67,7 @@ stages: - &verify_ESS_job_response_with_desired_test_steps_and_wait_up_to_15_minutes_for_COMPLETED name: verify job response with desired test steps and wait for desired job status - max_retries: 30 + max_retries: 180 request: url: "{tavern.env_vars.IRS_ESS_HOST}/ess/bpn/investigations/{job_id}" params: @@ -82,7 +82,7 @@ stages: json: job: state: COMPLETED - delay_after: 30 + delay_after: 5 - name: get response for created investigation request: @@ -1140,7 +1140,7 @@ stages: - &verify_job_is_running_and_wait_up_to_15_minutes_for_COMPLETED name: verify job is running and wait for desired job status - max_retries: 30 + max_retries: 180 request: url: "{tavern.env_vars.IRS_HOST}/irs/jobs/{job_id}" params: @@ -1155,7 +1155,7 @@ stages: json: job: state: COMPLETED - delay_after: 30 + delay_after: 5 - name: verify job response with desired test steps request: