Attachment 98405 Details for Bug 23290 – Bug 23290: (follow-up) Replace warning_like by warnings_like

[patch] Bug 23290: (follow-up) Replace warning_like by warnings_like

Bug-23290-follow-up-Replace-warninglike-by-warning.patch (text/plain), 2.56 KB, created by Martin Renvoize (ashimema) on 2020-02-04 14:27:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-02-04 14:27:31 UTC

Size: 2.56 KB

patch

obsolete

>From 9a16911f5c7c9f59ecef3d7421d6c594ef5175c6 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 17 Jan 2020 10:30:16 +0000
>Subject: [PATCH] Bug 23290: (follow-up) Replace warning_like by warnings_like
>
>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 <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> 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";
> </xsl:stylesheet>
> EOT
> $xslt_file = mytempfile($xslt);
>-warning_like { $output= $engine->transform( "<ignored/>", $xslt_file ); }
>-    qr/read_file called in XML::LibXSLT/,
>+warnings_like { $output= $engine->transform( "<ignored/>", $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";
> </xsl:stylesheet>
> EOT
> $xslt_file = mytempfile($xslt);
>-warning_like { $output= $engine->transform( "<ignored/>", $xslt_file ); }
>-    qr/write_file called in XML::LibXSLT/,
>+warnings_like { $output= $engine->transform( "<ignored/>", $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";
> </xsl:stylesheet>
> EOT
> $xslt_file = mytempfile($xslt);
>-warning_like { $output= $engine->transform( "<ignored/>", $xslt_file ); }
>-    qr/read_net called in XML::LibXSLT/,
>+warnings_like { $output= $engine->transform( "<ignored/>", $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";
> </xsl:stylesheet>
> EOT
> $xslt_file = mytempfile($xslt);
>-warning_like { $output= $engine->transform( "<ignored/>", $xslt_file ); }
>-    qr/write_net called in XML::LibXSLT/,
>+warnings_like { $output= $engine->transform( "<ignored/>", $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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23290: 91435 | 91437 | 95450 | 95451 | 95452 | 95453 | 95454 | 95475 | 95478 | 95480 | 95481 | 95482 | 95483 | 95484 | 95485 | 95551 | 96299 | 96300 | 96301 | 96302 | 96303 | 96304 | 97606 | 97607 | 97608 | 97609 | 97610 | 97611 | 97612 | 97613 | 97614 | 97615 | 97616 | 97617 | 97618 | 97619 | 97620 | 97871 | 97978 | 97980 | 98397 | 98398 | 98399 | 98400 | 98401 | 98402 | 98403 | 98404 | 98405 | 98406 | 99587