test: Allow db_dump-5 instead of db_dump

[apt.git] / test / integration / test-bug-596498-trusted-unsigned-repo

diff --git a/test/integration/test-bug-596498-trusted-unsigned-repo b/test/integration/test-bug-596498-trusted-unsigned-repo
index 94f280b8139b5f97859ec747ef11d4f415dd6fa5..4d0e3dc8971be5a7f7704c98825f037cc3be5db0 100755 (executable)
--- a/test/integration/test-bug-596498-trusted-unsigned-repo
+++ b/test/integration/test-bug-596498-trusted-unsigned-repo
@@ -1,13 +1,14 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'i386'
 
 buildsimplenativepackage 'cool' 'i386' '1.0' 'unstable'
 
 setupenvironment
 configarchitecture 'i386'
 
 buildsimplenativepackage 'cool' 'i386' '1.0' 'unstable'
 

+msgmsg 'default setup'

 setupaptarchive
 
 aptgetupdate() {
 setupaptarchive
 
 aptgetupdate() {


@@ -28,6 +29,7 @@ testsuccessequal "$PKGTEXT
 $DOWNLOG
 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 
 $DOWNLOG
 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 

+msgmsg 'sources marked trusted=no'

 sed -i -e 's#\(deb\(-src\)\?\) #\1 [trusted=no] #' $DEBFILE
 aptgetupdate 'testsuccess'
 
 sed -i -e 's#\(deb\(-src\)\?\) #\1 [trusted=no] #' $DEBFILE
 aptgetupdate 'testsuccess'
 


@@ -47,6 +49,7 @@ Download complete and in download only mode" aptget install cool:i386 --assume-n
 configarchitecture 'i386'
 
 find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
 configarchitecture 'i386'
 
 find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete

+msgmsg 'unsigned repo'

 sed -i -e 's#\(deb\(-src\)\?\) \[trusted=no\] #\1 #' $DEBFILE
 aptgetupdate
 
 sed -i -e 's#\(deb\(-src\)\?\) \[trusted=no\] #\1 #' $DEBFILE
 aptgetupdate
 


@@ -63,8 +66,9 @@ Authentication warning overridden.
 $DOWNLOG
 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 
 $DOWNLOG
 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 

+msgmsg 'sources marked trusted=yes'

 sed -i -e 's#\(deb\(-src\)\?\) #\1 [trusted=yes] #' $DEBFILE
 sed -i -e 's#\(deb\(-src\)\?\) #\1 [trusted=yes] #' $DEBFILE

-aptgetupdate
+aptgetupdate 'testsuccess'

 
 testsuccessequal "$PKGTEXT
 $DOWNLOG
 
 testsuccessequal "$PKGTEXT
 $DOWNLOG