diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-10-20 10:23:41 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-10-20 10:37:46 +0200 |
| commit | 4fa34122cbe347d21b3a162ff2fa75dd2e73c3a8 (patch) | |
| tree | 07de5c1bedf542cb0111cdf9f7aecd03c4affee9 /test/integration/test-apt-update-ims | |
| parent | 1df24acfdb8ba1cd8bbbaa166f170dda480ce41e (diff) | |
testcases: do not allow warnings in testsuccess
Adds a new testwarning which tests for zero exit and the presents of a
warning in the output, failing if either is not the case or if an error
is found, too. This allows us to change testsuccess to accept only
totally successful executions (= without warnings) which should help
finding regressions.
Git-Dch: Ignore
Diffstat (limited to 'test/integration/test-apt-update-ims')
| -rwxr-xr-x | test/integration/test-apt-update-ims | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims index eece0c84c..afae99563 100755 --- a/test/integration/test-apt-update-ims +++ b/test/integration/test-apt-update-ims @@ -12,9 +12,15 @@ setupaptarchive --no-update changetowebserver runtest() { + configallowinsecurerepositories "${1:-false}" + rm -f rootdir/var/lib/apt/lists/localhost* - testsuccess aptget update + if [ "$1" = 'true' ]; then + testwarning aptget update + else + testsuccess aptget update + fi # ensure no leftovers in partial testfailure ls "rootdir/var/lib/apt/lists/partial/*" @@ -62,10 +68,7 @@ runtest echo "Acquire::GzipIndexes "1";" > rootdir/etc/apt/apt.conf.d/02compressindex runtest - # no Release.gpg or InRelease -configallowinsecurerepositories "true" - msgmsg "Release only" EXPECT="Ign http://localhost:8080 unstable InRelease 404 Not Found @@ -81,7 +84,7 @@ W: The data from 'http://localhost:8080 unstable Release.gpg' is not signed. Pac find aptarchive -name 'Release.gpg' -delete echo "Acquire::GzipIndexes "0";" > rootdir/etc/apt/apt.conf.d/02compressindex -runtest +runtest "true" echo "Acquire::GzipIndexes "1";" > rootdir/etc/apt/apt.conf.d/02compressindex -runtest +runtest "true" |