From ae4080b960241ed96eed8942a8d2fee89fabfceb Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Sat, 6 Dec 2025 14:12:23 +0100 Subject: [PATCH] Adjust test for error message for Compose 5.0.0. (#1217) (#1218) (cherry picked from commit 2efcd6b2ec73634c263b35183533db6096e513da) Co-authored-by: Felix Fontein --- .../targets/docker_compose_v2/tasks/tests/pull.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml b/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml index 57914393..31d304a4 100644 --- a/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml +++ b/tests/integration/targets/docker_compose_v2/tasks/tests/pull.yml @@ -81,16 +81,19 @@ - assert: that: - present_1_check is failed or present_1_check is changed - - present_1_check is changed or present_1_check.msg.startswith('General error:') + - present_1_check is changed or 'General error:' in present_1_check.msg - present_1_check.warnings | default([]) | select('regex', ' please report this at ') | length == 0 - present_1 is failed - - present_1.msg.startswith('General error:') + - >- + 'General error:' in present_1.msg - present_1.warnings | default([]) | select('regex', ' please report this at ') | length == 0 - present_2_check is failed - - present_2_check.msg.startswith('Error when processing ' ~ cname ~ ':') + - present_2_check.msg.startswith('Error when processing ' ~ cname ~ ':') or + present_2_check.msg.startswith('Error when processing image ' ~ non_existing_image ~ ':') - present_2_check.warnings | default([]) | select('regex', ' please report this at ') | length == 0 - present_2 is failed - - present_2.msg.startswith('Error when processing ' ~ cname ~ ':') + - present_2.msg.startswith('Error when processing ' ~ cname ~ ':') or + present_2.msg.startswith('Error when processing image ' ~ non_existing_image ~ ':') - present_2.warnings | default([]) | select('regex', ' please report this at ') | length == 0 ####################################################################