test2005 to test2016: improve failure detection

diff --git a/tests/data/test2005 b/tests/data/test2005
index 3c38e2d2a6562388222c79e0b1c8881e6c355623..044d4675eb1977f67fa8337babda508a3f93a866 100644 (file)
--- a/tests/data/test2005
+++ b/tests/data/test2005
@@ -87,7 +87,7 @@ Metalink: validating (log/download2005)...
 Metalink: validating (log/download2005) OK
 </file3>
 <stripfile3>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile3>
 </verify>
 </testcase>

diff --git a/tests/data/test2006 b/tests/data/test2006
index 6c89f253bed1900efdbaf2dc35184e263dc89180..b183ab54fd9dec33202df3b8d5e28116d89c5e91 100644 (file)
--- a/tests/data/test2006
+++ b/tests/data/test2006
@@ -106,7 +106,7 @@ Metalink: validating (log/download2006)...
 Metalink: validating (log/download2006) OK
 </file4>
 <stripfile4>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile4>
 </verify>
 </testcase>

diff --git a/tests/data/test2007 b/tests/data/test2007
index e18074ce95b97a0202fc377dea21f5134bda04f2..1dbe922552bbce19ad9377f883ec2db78c4ee995 100644 (file)
--- a/tests/data/test2007
+++ b/tests/data/test2007
@@ -107,7 +107,7 @@ Metalink: validating (log/download2007)...
 Metalink: validating (log/download2007) OK
 </file4>
 <stripfile4>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile4>
 </verify>
 </testcase>

diff --git a/tests/data/test2008 b/tests/data/test2008
index 4828439d439b6cd4c1dde174b0e42e9ad52e77ec..12bacbfa20ae1dae4acf174b140d83c08283a4a4 100644 (file)
--- a/tests/data/test2008
+++ b/tests/data/test2008
@@ -99,7 +99,7 @@ Metalink: validating (log/download2008)...
 Metalink: validating (log/download2008) OK
 </file4>
 <stripfile4>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile4>
 </verify>
 </testcase>

diff --git a/tests/data/test2009 b/tests/data/test2009
index 2b225377f21fa46a477ea8959112b471b4039472..0940813822e3ac4da5d19bd5b7d885112e90f011 100644 (file)
--- a/tests/data/test2009
+++ b/tests/data/test2009
@@ -100,7 +100,7 @@ Metalink: validating (log/download2009)...
 Metalink: validating (log/download2009) OK
 </file4>
 <stripfile4>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile4>
 </verify>
 </testcase>

diff --git a/tests/data/test2010 b/tests/data/test2010
index 20f65ff7fdeb7ba2a0dd19d95dc29c2ec5d98ccf..c7cee2f669646a737d9683a282a17757418784ba 100644 (file)
--- a/tests/data/test2010
+++ b/tests/data/test2010
@@ -99,7 +99,7 @@ Metalink: validating (log/download2010)...
 Metalink: validating (log/download2010) OK
 </file4>
 <stripfile4>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile4>
 </verify>
 </testcase>

diff --git a/tests/data/test2011 b/tests/data/test2011
index 6a06146c483fdd5c4a9680e472b04db4f74b6489..7cce8c538e8f27ae1982b0128f52abeb9079f27f 100644 (file)
--- a/tests/data/test2011
+++ b/tests/data/test2011
@@ -87,7 +87,7 @@ Metalink: validating (log/download2011)...
 Metalink: validating (log/download2011) FAILED (digest mismatch)
 </file3>
 <stripfile3>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile3>
 </verify>
 </testcase>

diff --git a/tests/data/test2012 b/tests/data/test2012
index 6ff6db2066b99739c08b8a7abb2e3be08ce01332..59c042d127540662cc790add435768280da4db46 100644 (file)
--- a/tests/data/test2012
+++ b/tests/data/test2012
@@ -86,7 +86,7 @@ Metalink: validating (log/download2012)...
 Metalink: validating (log/download2012) FAILED (digest missing)
 </file3>
 <stripfile3>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile3>
 </verify>
 </testcase>

diff --git a/tests/data/test2013 b/tests/data/test2013
index dc0208bc98d845f198f117b6edb8c6ca08cc8559..60e85f3ea90609c592d0e21e1e302847187c855c 100644 (file)
--- a/tests/data/test2013
+++ b/tests/data/test2013
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt absolute path
+Metalink local XML file, attempt UNIX absolute path
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2013.metalink
@@ -72,7 +72,7 @@ Metalink: parsing (file://%PWD/log/test2013.metalink) WARNING (missing or invali
 Metalink: parsing (file://%PWD/log/test2013.metalink) FAILED
 </file2>
 <stripfile2>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile2>
 </verify>
 </testcase>

diff --git a/tests/data/test2014 b/tests/data/test2014
index 659bc922143f9f69d2c627113ed03a044dd6e433..01dc8b31b387bfaf2963abce4b52ed28bfb73b36 100644 (file)
--- a/tests/data/test2014
+++ b/tests/data/test2014
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt path relative to current
+Metalink local XML file, attempt UNIX path relative to current
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2014.metalink
@@ -72,7 +72,7 @@ Metalink: parsing (file://%PWD/log/test2014.metalink) WARNING (missing or invali
 Metalink: parsing (file://%PWD/log/test2014.metalink) FAILED
 </file2>
 <stripfile2>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile2>
 </verify>
 </testcase>

diff --git a/tests/data/test2015 b/tests/data/test2015
index 45646f2de53e189fb071513c2fcfa9530a1810ec..e4d09d50e34058421205ce840deab191b8021268 100644 (file)
--- a/tests/data/test2015
+++ b/tests/data/test2015
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt path relative to upper
+Metalink local XML file, attempt UNIX path relative to upper
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2015.metalink
@@ -72,7 +72,7 @@ Metalink: parsing (file://%PWD/log/test2015.metalink) WARNING (missing or invali
 Metalink: parsing (file://%PWD/log/test2015.metalink) FAILED
 </file2>
 <stripfile2>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile2>
 </verify>
 </testcase>

diff --git a/tests/data/test2016 b/tests/data/test2016
index a5f3674b023ead454b4690d7f2d9171ae1c22889..fbd6cd5d6bb15f6ae948b4ec7c5ccd534678824e 100644 (file)
--- a/tests/data/test2016
+++ b/tests/data/test2016
@@ -35,7 +35,7 @@ file
 Metalink
 </features>
  <name>
-Metalink local XML file, attempt path traversal
+Metalink local XML file, attempt UNIX path traversal
  </name>
 <command option="no-output,no-include">
 --metalink file://%PWD/log/test2016.metalink
@@ -72,7 +72,7 @@ Metalink: parsing (file://%PWD/log/test2016.metalink) WARNING (missing or invali
 Metalink: parsing (file://%PWD/log/test2016.metalink) FAILED
 </file2>
 <stripfile2>
-$_ = '' if ($_ !~ /^Metalink: /)
+$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i))
 </stripfile2>
 </verify>
 </testcase>