From 7747136421e9cd498a00e841f1c236c8e6cb78b5 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 29 Jun 2012 15:44:50 +0200 Subject: test2005 to test2016: improve failure detection --- tests/data/test2005 | 2 +- tests/data/test2006 | 2 +- tests/data/test2007 | 2 +- tests/data/test2008 | 2 +- tests/data/test2009 | 2 +- tests/data/test2010 | 2 +- tests/data/test2011 | 2 +- tests/data/test2012 | 2 +- tests/data/test2013 | 4 ++-- tests/data/test2014 | 4 ++-- tests/data/test2015 | 4 ++-- tests/data/test2016 | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/data/test2005 b/tests/data/test2005 index 3c38e2d2a..044d4675e 100644 --- a/tests/data/test2005 +++ b/tests/data/test2005 @@ -87,7 +87,7 @@ Metalink: validating (log/download2005)... Metalink: validating (log/download2005) OK -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2006 b/tests/data/test2006 index 6c89f253b..b183ab54f 100644 --- a/tests/data/test2006 +++ b/tests/data/test2006 @@ -106,7 +106,7 @@ Metalink: validating (log/download2006)... Metalink: validating (log/download2006) OK -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2007 b/tests/data/test2007 index e18074ce9..1dbe92255 100644 --- a/tests/data/test2007 +++ b/tests/data/test2007 @@ -107,7 +107,7 @@ Metalink: validating (log/download2007)... Metalink: validating (log/download2007) OK -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2008 b/tests/data/test2008 index 4828439d4..12bacbfa2 100644 --- a/tests/data/test2008 +++ b/tests/data/test2008 @@ -99,7 +99,7 @@ Metalink: validating (log/download2008)... Metalink: validating (log/download2008) OK -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2009 b/tests/data/test2009 index 2b225377f..094081382 100644 --- a/tests/data/test2009 +++ b/tests/data/test2009 @@ -100,7 +100,7 @@ Metalink: validating (log/download2009)... Metalink: validating (log/download2009) OK -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2010 b/tests/data/test2010 index 20f65ff7f..c7cee2f66 100644 --- a/tests/data/test2010 +++ b/tests/data/test2010 @@ -99,7 +99,7 @@ Metalink: validating (log/download2010)... Metalink: validating (log/download2010) OK -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2011 b/tests/data/test2011 index 6a06146c4..7cce8c538 100644 --- a/tests/data/test2011 +++ b/tests/data/test2011 @@ -87,7 +87,7 @@ Metalink: validating (log/download2011)... Metalink: validating (log/download2011) FAILED (digest mismatch) -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2012 b/tests/data/test2012 index 6ff6db206..59c042d12 100644 --- a/tests/data/test2012 +++ b/tests/data/test2012 @@ -86,7 +86,7 @@ Metalink: validating (log/download2012)... Metalink: validating (log/download2012) FAILED (digest missing) -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2013 b/tests/data/test2013 index dc0208bc9..60e85f3ea 100644 --- a/tests/data/test2013 +++ b/tests/data/test2013 @@ -35,7 +35,7 @@ file Metalink -Metalink local XML file, attempt absolute path +Metalink local XML file, attempt UNIX absolute path --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 -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2014 b/tests/data/test2014 index 659bc9221..01dc8b31b 100644 --- a/tests/data/test2014 +++ b/tests/data/test2014 @@ -35,7 +35,7 @@ file Metalink -Metalink local XML file, attempt path relative to current +Metalink local XML file, attempt UNIX path relative to current --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 -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2015 b/tests/data/test2015 index 45646f2de..e4d09d50e 100644 --- a/tests/data/test2015 +++ b/tests/data/test2015 @@ -35,7 +35,7 @@ file Metalink -Metalink local XML file, attempt path relative to upper +Metalink local XML file, attempt UNIX path relative to upper --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 -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) diff --git a/tests/data/test2016 b/tests/data/test2016 index a5f3674b0..fbd6cd5d6 100644 --- a/tests/data/test2016 +++ b/tests/data/test2016 @@ -35,7 +35,7 @@ file Metalink -Metalink local XML file, attempt path traversal +Metalink local XML file, attempt UNIX path traversal --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 -$_ = '' if ($_ !~ /^Metalink: /) +$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -- cgit v1.2.3