tests: update Metalink message format

8 files changed, 48 insertions, 24 deletions

diff --git a/tests/data/test2005 b/tests/data/test2005
index 16867fb40..3c38e2d2a 100644
--- a/tests/data/test2005
+++ b/tests/data/test2005
@@ -79,9 +79,12 @@ Data delivered from an HTTP resource
 <file2 name="log/stdout2005">
 </file2>
 <file3 name="log/stderr2005">
-Metalink: Metalink XML file was parsed successfully
-Metalink: Validating sha-256 checksum (This may take some time)...
-Metalink: log/download2005: OK
+Metalink: parsing (file://%PWD/log/test2005.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test2005.metalink) OK
+Metalink: fetching (log/download2005) from (http://%HOSTIP:%HTTPPORT/2005)...
+Metalink: fetching (log/download2005) from (http://%HOSTIP:%HTTPPORT/2005) OK
+Metalink: validating (log/download2005)...
+Metalink: validating (log/download2005) OK
 </file3>
 <stripfile3>
 $_ = '' if ($_ !~ /^Metalink: /)
diff --git a/tests/data/test2006 b/tests/data/test2006
index 4ad4c5798..6c89f253b 100644
--- a/tests/data/test2006
+++ b/tests/data/test2006
@@ -98,9 +98,12 @@ Funny-head: yesyes
 <file3 name="log/stdout2006">
 </file3>
 <file4 name="log/stderr2006">
-Metalink: Metalink XML file was parsed successfully
-Metalink: Validating sha-256 checksum (This may take some time)...
-Metalink: log/download2006: OK
+Metalink: parsing (file://%PWD/log/test2006.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test2006.metalink) OK
+Metalink: fetching (log/download2006) from (http://%HOSTIP:%HTTPPORT/2006)...
+Metalink: fetching (log/download2006) from (http://%HOSTIP:%HTTPPORT/2006) OK
+Metalink: validating (log/download2006)...
+Metalink: validating (log/download2006) OK
 </file4>
 <stripfile4>
 $_ = '' if ($_ !~ /^Metalink: /)
diff --git a/tests/data/test2007 b/tests/data/test2007
index 987e71e39..e18074ce9 100644
--- a/tests/data/test2007
+++ b/tests/data/test2007
@@ -99,9 +99,12 @@ Funny-head: yesyes
 <file3 name="log/stdout2007">
 </file3>
 <file4 name="log/stderr2007">
-Metalink: Metalink XML file was parsed successfully
-Metalink: Validating sha-256 checksum (This may take some time)...
-Metalink: log/download2007: OK
+Metalink: parsing (file://%PWD/log/test2007.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test2007.metalink) OK
+Metalink: fetching (log/download2007) from (http://%HOSTIP:%HTTPPORT/2007)...
+Metalink: fetching (log/download2007) from (http://%HOSTIP:%HTTPPORT/2007) OK
+Metalink: validating (log/download2007)...
+Metalink: validating (log/download2007) OK
 </file4>
 <stripfile4>
 $_ = '' if ($_ !~ /^Metalink: /)
diff --git a/tests/data/test2008 b/tests/data/test2008
index 057808a24..4828439d4 100644
--- a/tests/data/test2008
+++ b/tests/data/test2008
@@ -91,9 +91,12 @@ Funny-head: yesyes
 <file3 name="log/stdout2008">
 </file3>
 <file4 name="log/stderr2008">
-Metalink: Metalink XML file was parsed successfully
-Metalink: Validating sha-256 checksum (This may take some time)...
-Metalink: log/download2008: OK
+Metalink: parsing (file://%PWD/log/test2008.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test2008.metalink) OK
+Metalink: fetching (log/download2008) from (http://%HOSTIP:%HTTPPORT/2008)...
+Metalink: fetching (log/download2008) from (http://%HOSTIP:%HTTPPORT/2008) OK
+Metalink: validating (log/download2008)...
+Metalink: validating (log/download2008) OK
 </file4>
 <stripfile4>
 $_ = '' if ($_ !~ /^Metalink: /)
diff --git a/tests/data/test2009 b/tests/data/test2009
index 8e25039dc..2b225377f 100644
--- a/tests/data/test2009
+++ b/tests/data/test2009
@@ -92,9 +92,12 @@ Funny-head: yesyes
 <file3 name="log/stdout2009">
 </file3>
 <file4 name="log/stderr2009">
-Metalink: Metalink XML file was parsed successfully
-Metalink: Validating sha-256 checksum (This may take some time)...
-Metalink: log/download2009: OK
+Metalink: parsing (file://%PWD/log/test2009.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test2009.metalink) OK
+Metalink: fetching (log/download2009) from (http://%HOSTIP:%HTTPPORT/2009)...
+Metalink: fetching (log/download2009) from (http://%HOSTIP:%HTTPPORT/2009) OK
+Metalink: validating (log/download2009)...
+Metalink: validating (log/download2009) OK
 </file4>
 <stripfile4>
 $_ = '' if ($_ !~ /^Metalink: /)
diff --git a/tests/data/test2010 b/tests/data/test2010
index 51839d205..20f65ff7f 100644
--- a/tests/data/test2010
+++ b/tests/data/test2010
@@ -91,9 +91,12 @@ Funny-head: yesyes
 <file3 name="log/stdout2010">
 </file3>
 <file4 name="log/stderr2010">
-Metalink: Metalink XML file was parsed successfully
-Metalink: Validating sha-256 checksum (This may take some time)...
-Metalink: log/download2010: OK
+Metalink: parsing (file://%PWD/log/test2010.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test2010.metalink) OK
+Metalink: fetching (log/download2010) from (http://%HOSTIP:%HTTPPORT/2010)...
+Metalink: fetching (log/download2010) from (http://%HOSTIP:%HTTPPORT/2010) OK
+Metalink: validating (log/download2010)...
+Metalink: validating (log/download2010) OK
 </file4>
 <stripfile4>
 $_ = '' if ($_ !~ /^Metalink: /)
diff --git a/tests/data/test2011 b/tests/data/test2011
index db355f57f..6a06146c4 100644
--- a/tests/data/test2011
+++ b/tests/data/test2011
@@ -79,9 +79,12 @@ Data delivered from an HTTP resource
 <file2 name="log/stdout2011">
 </file2>
 <file3 name="log/stderr2011">
-Metalink: Metalink XML file was parsed successfully
-Metalink: Validating sha-256 checksum (This may take some time)...
-Metalink: log/download2011: FAILED
+Metalink: parsing (file://%PWD/log/test2011.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test2011.metalink) OK
+Metalink: fetching (log/download2011) from (http://%HOSTIP:%HTTPPORT/2011)...
+Metalink: fetching (log/download2011) from (http://%HOSTIP:%HTTPPORT/2011) OK
+Metalink: validating (log/download2011)...
+Metalink: validating (log/download2011) FAILED (digest mismatch)
 </file3>
 <stripfile3>
 $_ = '' if ($_ !~ /^Metalink: /)
diff --git a/tests/data/test2012 b/tests/data/test2012
index 66cef0f03..6ff6db206 100644
--- a/tests/data/test2012
+++ b/tests/data/test2012
@@ -78,9 +78,12 @@ Some contents delivered from an HTTP resource
 <file2 name="log/stdout2012">
 </file2>
 <file3 name="log/stderr2012">
-Metalink: Metalink XML file was parsed successfully
-Metalink: Validation not possible: missing hash
-Metalink: something should tell log/download2012 wasn't validated
+Metalink: parsing (file://%PWD/log/test2012.metalink) metalink/XML...
+Metalink: parsing (file://%PWD/log/test2012.metalink) WARNING (digest missing)
+Metalink: fetching (log/download2012) from (http://%HOSTIP:%HTTPPORT/2012)...
+Metalink: fetching (log/download2012) from (http://%HOSTIP:%HTTPPORT/2012) OK
+Metalink: validating (log/download2012)...
+Metalink: validating (log/download2012) FAILED (digest missing)
 </file3>
 <stripfile3>
 $_ = '' if ($_ !~ /^Metalink: /)