From d0facd2b73c095bbd4a386ca8b1f271cb1911c8f Mon Sep 17 00:00:00 2001 From: Hayley Mapley Date: Tue, 14 Apr 2020 16:00:40 +1200 Subject: [PATCH] Bug 24673 (18.11.x U18 follow-up): Fixing t/db_dependent/Koha/XSLT/Security.t The test t/db_dependent/Koha/XSLT/Security.t failed on Jenkins for U18 when this bug's patches were backported, due to it returning a different IO error message for XSLT. This patch adds a condition to the regex which matches both messages: 'Failed to load external entity' and 'Failed to load HTTP resource' Signed-off-by: Hayley Mapley --- t/db_dependent/Koha/XSLT/Security.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/db_dependent/Koha/XSLT/Security.t b/t/db_dependent/Koha/XSLT/Security.t index 249d549afc..ebc9e789c5 100644 --- a/t/db_dependent/Koha/XSLT/Security.t +++ b/t/db_dependent/Koha/XSLT/Security.t @@ -121,7 +121,7 @@ EOT $xslt_file = mytempfile($xslt); $engine->print_warns(1); warning_like { $output= $engine->transform( "", $xslt_file ); } - qr/I\/O warning : failed to load external entity/, + qr/I\/O warning : failed to load (external entity|HTTP resource)/, 'Remote import does not fail on read_net'; sub mytempfile { -- 2.39.5