projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
report warnings&errors consistently in edit-sources
[apt.git]
/
test
/
integration
/
test-apt-update-unauth
diff --git
a/test/integration/test-apt-update-unauth
b/test/integration/test-apt-update-unauth
index 7347f7d10ebb3eb82a7aa87fbf6ad5f976a72579..ef1e4eca7b020db1ccea6e2199b56f862e7dae54 100755
(executable)
--- a/
test/integration/test-apt-update-unauth
+++ b/
test/integration/test-apt-update-unauth
@@
-5,16
+5,17
@@
#
set -e
#
set -e
-TESTDIR=
$(readlink -f $(dirname $0))
-.
$TESTDIR/framework
+TESTDIR=
"$(readlink -f "$(dirname "$0")")"
+.
"$TESTDIR/framework"
umask 022
setupenvironment
configarchitecture "i386"
umask 022
setupenvironment
configarchitecture "i386"
+configcompression '.' 'xz'
-insertpackage 'unstable' 'foo' '
all
' '1.0'
-insertsource 'unstable' 'foo' 'a
ll
' '1.0'
+insertpackage 'unstable' 'foo' '
i386
' '1.0'
+insertsource 'unstable' 'foo' 'a
ny
' '1.0'
setupaptarchive --no-update
changetowebserver
setupaptarchive --no-update
changetowebserver
@@
-45,7
+46,7
@@
runtest() {
listcurrentlistsdirectory > lists.before
# update and ensure all is reverted on the hashsum failure
listcurrentlistsdirectory > lists.before
# update and ensure all is reverted on the hashsum failure
- testfailure aptget update -o Debug::Acquire::Transaction=
0
-o Debug::pkgAcquire::Auth=1 -o Debug::pkgAcquire::worker=0 -o Debug::acquire::http=0
+ testfailure aptget update -o Debug::Acquire::Transaction=
1
-o Debug::pkgAcquire::Auth=1 -o Debug::pkgAcquire::worker=0 -o Debug::acquire::http=0
# ensure we have before what we have after
msgtest 'Check rollback on going from' 'unauth -> auth'
# ensure we have before what we have after
msgtest 'Check rollback on going from' 'unauth -> auth'
@@
-53,10
+54,13
@@
runtest() {
if cmp lists.before lists.after; then
msgpass
else
if cmp lists.before lists.after; then
msgpass
else
+ echo >&2
echo >&2 '### Output of previous apt-get update ###'
echo >&2 '### Output of previous apt-get update ###'
- cat >&2 rootdir/tmp/testfailure.output
+ cat >&2 rootdir/tmp/testfailure.output
|| true
echo >&2 '### Changes in the lists-directory: ###'
echo >&2 '### Changes in the lists-directory: ###'
- diff -u >&2 lists.before lists.after
+ diff -u >&2 lists.before lists.after || true
+ echo >&2 '### Contents of the lists-directory: ###'
+ ls -l rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists/partial || true
msgfail
fi
msgfail
fi