diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-09-29 11:47:03 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-29 11:47:03 +0200 |
commit | c292cc32b3ab0d70c63e68f7c94446932217c0ec (patch) | |
tree | 3b8a437719d02c57763873255ba23e0b5d3b6d33 | |
parent | ed6fa9754dba590e92604e09013c1478ecd46443 (diff) |
more test fixes
-rwxr-xr-x | test/integration/test-bug-596498-trusted-unsigned-repo | 2 | ||||
-rwxr-xr-x | test/integration/test-hashsum-verification | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/test/integration/test-bug-596498-trusted-unsigned-repo b/test/integration/test-bug-596498-trusted-unsigned-repo index 06c9c8285..973520a97 100755 --- a/test/integration/test-bug-596498-trusted-unsigned-repo +++ b/test/integration/test-bug-596498-trusted-unsigned-repo @@ -12,7 +12,7 @@ setupaptarchive aptgetupdate() { rm -rf rootdir/var/lib/apt/ rootdir/var/cache/apt/*.bin - aptget update -qq + aptget update -qq --allow-unauthenticated } PKGTEXT="$(aptget install cool --assume-no -d | head -n 7)" diff --git a/test/integration/test-hashsum-verification b/test/integration/test-hashsum-verification index 2a400dcb4..2db2bab0f 100755 --- a/test/integration/test-hashsum-verification +++ b/test/integration/test-hashsum-verification @@ -70,9 +70,13 @@ runtest() { rm -rf rootdir/var/lib/apt/lists rm aptarchive/InRelease aptarchive/Release.gpg msgtest 'unsigned apt-get update gets the expected hashsum mismatch' - aptget update 2>&1 | grep "Hash Sum mismatch" > /dev/null && msgpass || msgfail - - + aptget update --allow-unauthenticated >output.log 2>&1 || true + if grep -q "Hash Sum mismatch" output.log; then + msgpass + else + cat output.log + msgfail + fi } for COMPRESSEDINDEXES in 'false' 'true'; do |