summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-08-01 17:15:53 +0200
committerMichael Vogt <mvo@debian.org>2014-08-01 17:15:53 +0200
commit183160cb20cd4aa86e78657bf060bf688edce703 (patch)
treeb6cbc335bdedb45fdad53622018710c9fe505756 /test/integration
parent7abcfdde365d2f1110b1f1189e3fce04abdac98c (diff)
make errors more consistent
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-apt-update-rollback16
1 files changed, 3 insertions, 13 deletions
diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index b8a2b0791..24027787e 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -59,9 +59,7 @@ test_inrelease_to_broken_hash_reverts_all() {
break_repository_sources_index
# test the error condition
- testequal "W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease
-
-W: Failed to fetch file:${APTARCHIVE}/dists/unstable/main/source/Sources Hash Sum mismatch
+ testequal "W: Failed to fetch file:${APTARCHIVE}/dists/unstable/main/source/Sources Hash Sum mismatch
E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
# ensure that the Packages file is also rolled back
@@ -100,13 +98,7 @@ test_inreleae_to_release_reverts_all() {
break_repository_sources_index
# ensure error
- testequal "W: Failed to fetch file:$APTARCHIVE/dists/unstable/InRelease
-
-W: Failed to fetch file:$APTARCHIVE/dists/unstable/Release
-
-W: Failed to fetch file:$APTARCHIVE/dists/unstable/Release.gpg
-
-W: Failed to fetch file:$APTARCHIVE/dists/unstable/main/source/Sources Hash Sum mismatch
+ testequal "W: Failed to fetch file:$APTARCHIVE/dists/unstable/main/source/Sources Hash Sum mismatch
E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq # -o Debug::acquire::transaction=1
@@ -133,9 +125,7 @@ E: There are problems and -y was used without --force-yes" aptget install -qq -y
add_new_package
break_repository_sources_index
- testequal "W: Failed to fetch file:$APTARCHIVE/dists/unstable/InRelease
-
-W: Failed to fetch file:$APTARCHIVE/dists/unstable/main/source/Sources Hash Sum mismatch
+ testequal "W: Failed to fetch file:$APTARCHIVE/dists/unstable/main/source/Sources Hash Sum mismatch
E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq