Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans

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

diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index fddd26bd9f33ba207ba72d9eaccef477a9b586b7..9fbc4288ddc8e70e72f31733b9d61dd56284cd6e 100755 (executable)
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -29,17 +29,17 @@ aptcdromlog() {
        test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!"
        test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!"
        aptcdrom "$@" -o quiet=1 >rootdir/tmp/apt-cdrom.log 2>&1 </dev/null
-       sed -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' rootdir/tmp/apt-cdrom.log
+       sed -e '/gpgv\?: Signature made/ d' -e '/gpgv\?: Good signature/ d' -e '/^Identifying/ d' -e '/Reading / d' rootdir/tmp/apt-cdrom.log
        test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!"
        test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!"
 }
 
 CDROM_PRE="Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/
-Unmounting CD-ROM
+Unmounting CD-ROM...
 Waiting for disc...
 Please insert a Disc in the drive and press enter 
 Mounting CD-ROM...
-Scanning disc for index files.."
+Scanning disc for index files..."
 CDROM_POST="This disc is called: 
 'Debian APT Testdisk 0.8.15'
 Writing new source list