From f9ee6fda5a7c43e2af880a2ef39190aa03b382b8 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 17 Jan 2020 10:30:16 +0000 Subject: [PATCH] Bug 23290: (follow-up) Replace warning_like by warnings_like Content-Type: text/plain; charset=utf-8 Security.t does not pass anymore ;) Due to bug 23290 the tests now trigger an additional runtime error that we should also catch to let the tests pass again. Test plan: Run t/db_dependent/Koha/XSLT/Security.t Signed-off-by: Marcel de Rooy --- t/db_dependent/Koha/XSLT/Security.t | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t/db_dependent/Koha/XSLT/Security.t b/t/db_dependent/Koha/XSLT/Security.t index 9c82b85896..f61c14a48e 100644 --- a/t/db_dependent/Koha/XSLT/Security.t +++ b/t/db_dependent/Koha/XSLT/Security.t @@ -60,8 +60,8 @@ $xslt=<<"EOT"; EOT $xslt_file = mytempfile($xslt); -warning_like { $output= $engine->transform( "", $xslt_file ); } - qr/read_file called in XML::LibXSLT/, +warnings_like { $output= $engine->transform( "", $xslt_file ); } + [ qr/read_file called in XML::LibXSLT/, qr/runtime error/ ], 'Triggered security callback for read_file'; # Trigger write_file @@ -74,8 +74,8 @@ $xslt=<<"EOT"; EOT $xslt_file = mytempfile($xslt); -warning_like { $output= $engine->transform( "", $xslt_file ); } - qr/write_file called in XML::LibXSLT/, +warnings_like { $output= $engine->transform( "", $xslt_file ); } + [ qr/write_file called in XML::LibXSLT/, qr/runtime error/ ], 'Triggered security callback for write_file'; # Trigger read_net @@ -88,8 +88,8 @@ $xslt=<<"EOT"; EOT $xslt_file = mytempfile($xslt); -warning_like { $output= $engine->transform( "", $xslt_file ); } - qr/read_net called in XML::LibXSLT/, +warnings_like { $output= $engine->transform( "", $xslt_file ); } + [ qr/read_net called in XML::LibXSLT/, qr/runtime error/ ], 'Triggered security callback for read_net'; # Trigger write_net @@ -104,8 +104,8 @@ $xslt=<<"EOT"; EOT $xslt_file = mytempfile($xslt); -warning_like { $output= $engine->transform( "", $xslt_file ); } - qr/write_net called in XML::LibXSLT/, +warnings_like { $output= $engine->transform( "", $xslt_file ); } + [ qr/write_net called in XML::LibXSLT/, qr/runtime error/ ], 'Triggered security callback for write_net'; # Check remote import (include should be similar) -- 2.11.0