Bug 23290: (follow-up) Replace warning_like by warnings_like
authorMarcel de Rooy <m.de.rooy@rijksmuseum.nl>
Fri, 17 Jan 2020 10:30:16 +0000 (10:30 +0000)
committerMartin Renvoize <martin.renvoize@ptfs-europe.com>
Tue, 25 Feb 2020 13:41:14 +0000 (13:41 +0000)
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

index 9c82b85..f61c14a 100644 (file)
@@ -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)