From 57f7fb6511fcc7c55ee7a88475d15385093c048e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 16 Jun 2016 23:13:26 +0200 Subject: run update post-invokes even on (partial) failures Unsecure repositories result in error messages by default which causes the acquire run to fail hard, but non-failing repositories are still updated just like in the slightly less hard-failures which got this behaviour in 35664152e47a1d4d712fd52e0f0a2dc8ed359d32. --- test/integration/test-apt-update-hooks | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'test/integration/test-apt-update-hooks') diff --git a/test/integration/test-apt-update-hooks b/test/integration/test-apt-update-hooks index 0a4ee59b4..d81ef297e 100755 --- a/test/integration/test-apt-update-hooks +++ b/test/integration/test-apt-update-hooks @@ -9,7 +9,7 @@ configarchitecture 'i386' confighashes 'SHA512' insertpackage 'unstable' 'foo' 'i386' '1.0' -insertpackage 'testing' 'foo' 'any' '1.0' +insertpackage 'testing' 'foo' 'i386' '1.0' setupaptarchive --no-update APTARCHIVE="$(readlink -f ./aptarchive)" @@ -28,16 +28,22 @@ testsuccess grep "SUCCESS" aptupdate.output msgmsg "Some sources broken => run Post-Invoke-Success and Post-Invoke" sed -i -e '/^ / d' -e '/^SHA512:/ d' "$APTARCHIVE/dists/unstable/Release" +testsuccess rm "$(aptget indextargets 'Created-By: Packages' 'Suite: testing' --format '$(FILENAME)')" signreleasefiles -testfailure aptget update +listcurrentlistsdirectory > lists.before +testfailure apt update cp rootdir/tmp/testfailure.output aptupdate.output +listcurrentlistsdirectory > lists.after +testfailure cmp lists.before lists.after testsuccess grep "RUN" aptupdate.output testsuccess grep "SUCCESS" aptupdate.output msgmsg "All sources broken => run Post-Invoke" sed -i -e '/^ / d' -e '/^SHA512:/ d' "$APTARCHIVE/dists/testing/Release" signreleasefiles -testfailure aptget update +mv lists.after lists.before +testfailure apt update cp rootdir/tmp/testfailure.output aptupdate.output +testfileequal lists.before "$(listcurrentlistsdirectory)" testsuccess grep "RUN" aptupdate.output testfailure grep "SUCCESS" aptupdate.output -- cgit v1.2.3