don't purge directly, but remove and do purge at the end

[apt.git] / test / integration / test-apt-cdrom

diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index ce31b5934830a9a7e0b76120435ee02fc712ce3f..a3c3b5ba0a170b5e683ff7aae2c8882c7fdc1480 100755 (executable)
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

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

 setupenvironment
 configarchitecture 'amd64' 'i386'
 
 setupenvironment
 configarchitecture 'amd64' 'i386'
 


@@ -51,7 +51,7 @@ Unmounting CD-ROM...
 Repeat this process for the rest of the CDs in your set."
 
 testsuccessequal "$CDROM_PRE
 Repeat this process for the rest of the CDs in your set."
 
 testsuccessequal "$CDROM_PRE

-Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures
+Found 3 package indexes, 1 source indexes, 1 translation indexes and 1 signatures

 Found label 'Debian APT Testdisk 0.8.15'
 $CDROM_POST" aptcdromlog add
 
 Found label 'Debian APT Testdisk 0.8.15'
 $CDROM_POST" aptcdromlog add
 


@@ -116,18 +116,18 @@ testcdromusage
 
 # check Idempotence of apt-cdrom (and disabling of Translation dropping)
 testsuccessequal "$CDROM_PRE
 
 # check Idempotence of apt-cdrom (and disabling of Translation dropping)
 testsuccessequal "$CDROM_PRE

-Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures
+Found 3 package indexes, 1 source indexes, 2 translation indexes and 1 signatures

 $CDROM_POST" aptcdromlog add -o APT::CDROM::DropTranslation=0
 
 # take Translations from previous runs as needed
 testsuccessequal "$CDROM_PRE
 $CDROM_POST" aptcdromlog add -o APT::CDROM::DropTranslation=0
 
 # take Translations from previous runs as needed
 testsuccessequal "$CDROM_PRE

-Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures
+Found 3 package indexes, 1 source indexes, 2 translation indexes and 1 signatures

 $CDROM_POST" aptcdromlog add
 msgtest 'Test for the german description translation of' 'testing'
 aptcache show testing -o Acquire::Languages=de | grep -q '^Description-de: ' && msgpass || msgfail
 rm -rf rootdir/var/lib/apt/lists
 testsuccessequal "$CDROM_PRE
 $CDROM_POST" aptcdromlog add
 msgtest 'Test for the german description translation of' 'testing'
 aptcache show testing -o Acquire::Languages=de | grep -q '^Description-de: ' && msgpass || msgfail
 rm -rf rootdir/var/lib/apt/lists
 testsuccessequal "$CDROM_PRE

-Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures
+Found 3 package indexes, 1 source indexes, 1 translation indexes and 1 signatures

 $CDROM_POST" aptcdromlog add
 msgtest 'Test for the english description translation of' 'testing'
 aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' && msgpass || msgfail
 $CDROM_POST" aptcdromlog add
 msgtest 'Test for the english description translation of' 'testing'
 aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' && msgpass || msgfail