summaryrefslogtreecommitdiff
path: root/test/integration/test-apt-update-nofallback
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-10-20 10:23:41 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-10-20 10:37:46 +0200
commit4fa34122cbe347d21b3a162ff2fa75dd2e73c3a8 (patch)
tree07de5c1bedf542cb0111cdf9f7aecd03c4affee9 /test/integration/test-apt-update-nofallback
parent1df24acfdb8ba1cd8bbbaa166f170dda480ce41e (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-nofallback')
-rwxr-xr-xtest/integration/test-apt-update-nofallback8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index 12977129f..831fc67eb 100755
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -54,8 +54,7 @@ assert_repo_is_intact()
setupaptarchive_with_lists_clean()
{
setupaptarchive --no-update
- rm -f rootdir/var/lib/apt/lists/_*
- #rm -rf rootdir/var/lib/apt/lists
+ rm -rf rootdir/var/lib/apt/lists
}
test_from_inrelease_to_unsigned()
@@ -87,14 +86,15 @@ test_from_inrelease_to_unsigned_with_override()
{
# setup archive with InRelease file
setupaptarchive_with_lists_clean
- testsuccess aptget update
+ # FIXME: is not what the server reported 4104 4106
+ testsuccess aptget update #-o Debug::pkgAcquire::Worker=1
# simulate moving to a unsigned but otherwise valid repo
simulate_mitm_and_inject_evil_package
generatereleasefiles
# and ensure we can update to it (with enough force)
- testsuccess aptget update --allow-insecure-repositories \
+ testwarning aptget update --allow-insecure-repositories \
-o Acquire::AllowDowngradeToInsecureRepositories=1
# but that the individual packages are still considered untrusted
testequal "WARNING: The following packages cannot be authenticated!