show item ID in Hit, Ign and Err lines as well

[apt.git] / test / integration / test-apt-get-update-unauth-warning

diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index 8e212a3c432e674efcf40ee37a6885d399b10e12..5b81d56d29e34683a3c04557f21c46c0d79bdae6 100755 (executable)
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/test/integration/test-apt-get-update-unauth-warning
@@ -9,6 +9,7 @@ TESTDIR=$(readlink -f $(dirname $0))
 
 setupenvironment
 configarchitecture "i386"
 
 setupenvironment
 configarchitecture "i386"

+configcompression '.' 'gz'

 
 # a "normal" package with source and binary
 buildsimplenativepackage 'foo' 'all' '2.0'
 
 # a "normal" package with source and binary
 buildsimplenativepackage 'foo' 'all' '2.0'


@@ -19,28 +20,32 @@ APTARCHIVE=$(readlink -f ./aptarchive)
 rm -f $APTARCHIVE/dists/unstable/*Release*
 
 # update without authenticated files leads to warning
 rm -f $APTARCHIVE/dists/unstable/*Release*
 
 # update without authenticated files leads to warning

-testequal "Ign file: unstable InRelease
+testfailureequal "Ign:1 file:$APTARCHIVE unstable InRelease

   File not found
   File not found

-Err file: unstable Release
+Err:2 file:$APTARCHIVE unstable Release

   File not found
   File not found

-W: The repository 'file: unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository.
-W: Use --allow-insecure-repositories to force the update
-W: Failed to fetch file:$APTARCHIVE/dists/unstable/Release  File not found
-
-E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
+W: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository.
+E: Use --allow-insecure-repositories to force the update" aptget update --no-allow-insecure-repositories

 
 # no package foo
 
 # no package foo

-testequal "Listing..." apt list foo
-testequal "partial" ls rootdir/var/lib/apt/lists
+testsuccessequal 'Listing...' apt list foo
+testequal 'lock
+partial' ls rootdir/var/lib/apt/lists

 
 

+filesize() {
+       stat -c%s "$(aptget files --no-release-info --format '$(URI)' "Created-By: $1" | cut -d'/' -f 3- ).gz"
+}

 # allow override
 # allow override

-testequal "Ign file: unstable InRelease
+testwarningequal "Ign:1 file:$APTARCHIVE unstable InRelease

   File not found
   File not found

-Ign file: unstable Release
+Ign:2 file:$APTARCHIVE unstable Release

   File not found
   File not found

+Get:3 file:$APTARCHIVE unstable/main Sources [$(filesize 'Sources') B]
+Get:4 file:$APTARCHIVE unstable/main i386 Packages [$(filesize 'Packages') B]
+Get:5 file:$APTARCHIVE unstable/main Translation-en [$(filesize 'Translations') B]

 Reading package lists...
 Reading package lists...

-W: The repository 'file: unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository." aptget update --allow-insecure-repositories
+W: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository." aptget update --allow-insecure-repositories

 # ensure we can not install the package
 # ensure we can not install the package

-testequal "WARNING: The following packages cannot be authenticated!
+testfailureequal "WARNING: The following packages cannot be authenticated!

   foo
 E: There are problems and -y was used without --force-yes" aptget install -qq -y foo
   foo
 E: There are problems and -y was used without --force-yes" aptget install -qq -y foo