test2005 to test2016: improve failure detection

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>