X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/6c0765c096ffb4df14169236c865bbb2b10974ae..ff2717e8c6a7633bbd38be95b2d30615802b6679:/test/integration/framework

diff --git a/test/integration/framework b/test/integration/framework
index 2fb924802..004d24417 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -9,6 +9,14 @@ while [ -n "$1" ]; do
 		export MSGLEVEL=4
 	elif [ "$1" = '--color=no' ]; then
 		export MSGCOLOR='NO'
+	elif [ "$1" = '--color=yes' ]; then
+		export MSGCOLOR='YES'
+	elif [ "$1" = '--color' ]; then
+		export MSGCOLOR="$(echo "$2" | tr 'a-z' 'A-Z')"
+		shift
+	elif [ "$1" = '--level' ]; then
+		export MSGLEVEL=$2
+		shift
 	else
 		echo >&2 "WARNING: Unknown parameter »$1« will be ignored"
 	fi
@@ -17,7 +25,7 @@ done
 export MSGLEVEL="${MSGLEVEL:-3}"
 
 # we all like colorful messages
-if [ "$MSGCOLOR" != 'NO' ] && [ "$MSGCOLOR" != 'ALWAYS' ]; then
+if [ "${MSGCOLOR:-YES}" = 'YES' ]; then
 	if [ ! -t 1 ]; then # but check that we output to a terminal
 		export MSGCOLOR='NO'
 	fi
@@ -46,7 +54,7 @@ msgprintf() {
 		printf "$START " "$1"
 		shift
 		while [ -n "$1" ]; do
-			printf "$MIDDLE " "$(echo "$1" | sed -e 's#^apt\([cfghs]\)#apt-\1#')"
+			printf "$MIDDLE " "$(echo "$1" | sed -e 's#^apt\([cfghks]\)#apt-\1#')"
 			shift
 		done
 	fi
@@ -161,11 +169,11 @@ runapt() {
 	msgdebug "Executing: ${CCMD}$*${CDEBUG} "
 	local CMD="$1"
 	shift
-	case $CMD in
+	case "$CMD" in
 	sh|aptitude|*/*|command) ;;
 	*) CMD="${BUILDDIRECTORY}/$CMD";;
 	esac
-	MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${LIBRARYPATH} $CMD "$@"
+	MALLOC_PERTURB_=21 MALLOC_CHECK_=2 APT_CONFIG="$(getaptconfig)" LD_LIBRARY_PATH=${LIBRARYPATH} "$CMD" "$@"
 }
 aptconfig() { runapt apt-config "$@"; }
 aptcache() { runapt apt-cache "$@"; }
@@ -237,13 +245,23 @@ addtrap() {
 	trap "shellsetedetector; $CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
 }
 
+escape_shell() {
+    echo "$@" | sed -e "s#'#'\"'\"'#g"
+}
+
 setupenvironment() {
 	# privilege dropping and testing doesn't work if /tmp isn't world-writeable (as e.g. with libpam-tmpdir)
 	if [ -n "$TMPDIR" ] && [ "$(id -u)" = '0' ] && [ "$(stat --format '%a' "$TMPDIR")" != '1777' ]; then
 		unset TMPDIR
 	fi
 	TMPWORKINGDIRECTORY="$(mktemp -d)"
-	addtrap "cd /; rm -rf \"$TMPWORKINGDIRECTORY\";"
+	addtrap "cd /; rm -rf '$(escape_shell "$TMPWORKINGDIRECTORY")';"
+	if [ -n "$TMPDIR_ADD" ]; then
+		TMPWORKINGDIRECTORY="${TMPWORKINGDIRECTORY}/${TMPDIR_ADD}"
+		mkdir -p "$TMPWORKINGDIRECTORY"
+		unset TMPDIR_ADD
+		export TMPDIR="$TMPWORKINGDIRECTORY"
+	fi
 	msgninfo "Preparing environment for ${0##*/} in ${TMPWORKINGDIRECTORY}…"
 
 	mkdir -m 700 "${TMPWORKINGDIRECTORY}/downloaded"
@@ -299,34 +317,32 @@ setupenvironment() {
 	if [ -f "${TESTDIRECTORY}/${SOURCESSFILE}" ]; then
 		cp "${TESTDIRECTORY}/${SOURCESSFILE}" aptarchive/Sources
 	fi
-	for key in $(find "$TESTDIRECTORY" -name '*.pub' -o -name '*.sec'); do
-		cp "$key" keys/
-		chmod 644 "$key"
-	done
+	find "$TESTDIRECTORY" \( -name '*.pub' -o -name '*.sec' \) -exec cp '{}' keys/ \;
+	chmod 644 keys/*
 	ln -s "${TMPWORKINGDIRECTORY}/keys/joesixpack.pub" rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
 
 	echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
 	echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
 	echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
 	echo "Dir::Bin::Methods \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/methods\";" >> aptconfig.conf
-	# store apt-key were we can access it, even if we run it as a different user
-	# destroys coverage reporting though, so just do it for root for now
+	# either store apt-key were we can access it, even if we run it as a different user
+	#cp "${BUILDDIRECTORY}/apt-key" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/"
+	#chmod o+rx "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key"
+	#echo "Dir::Bin::apt-key \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key\";" >> aptconfig.conf
+	# destroys coverage reporting though, so we disable changing user for the calling gpgv
+	echo "Dir::Bin::apt-key \"${BUILDDIRECTORY}/apt-key\";" >> aptconfig.conf
 	if [ "$(id -u)" = '0' ]; then
-		cp "${BUILDDIRECTORY}/apt-key" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/"
-		chmod o+rx "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key"
-		echo "Dir::Bin::apt-key \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key\";" >> aptconfig.conf
-	else
-		echo "Dir::Bin::apt-key \"${BUILDDIRECTORY}/apt-key\";" >> aptconfig.conf
+		echo 'Binary::gpgv::Debug::NoDropPrivs "true";' >>aptconfig.conf
 	fi
 
 	cat > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" <<EOF
 #!/bin/sh
 set -e
-if [ -r "${TMPWORKINGDIRECTORY}/noopchroot.so" ]; then
+if [ -r '${TMPWORKINGDIRECTORY}/noopchroot.so' ]; then
 	if [ -n "\$LD_LIBRARY_PATH" ]; then
-		export LD_LIBRARY_PATH="${TMPWORKINGDIRECTORY}:${LD_LIBRARY_PATH}"
+		export LD_LIBRARY_PATH='${TMPWORKINGDIRECTORY}:'"\${LD_LIBRARY_PATH}"
 	else
-		export LD_LIBRARY_PATH="${TMPWORKINGDIRECTORY}"
+		export LD_LIBRARY_PATH='${TMPWORKINGDIRECTORY}'
 	fi
 	if [ -n "\$LD_PRELOAD" ]; then
 		export LD_PRELOAD="noopchroot.so \${LD_PRELOAD}"
@@ -337,13 +353,13 @@ fi
 EOF
 	cp "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg"
 	cat >> "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" <<EOF
-exec fakeroot "${DPKG:-dpkg}" --root="${TMPWORKINGDIRECTORY}/rootdir" \\
-	--log="${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log" \\
+exec fakeroot '${DPKG:-dpkg}' --root='${TMPWORKINGDIRECTORY}/rootdir' \\
+	--log='${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log' \\
 	--force-not-root --force-bad-path "\$@"
 EOF
 	cat >> "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg" <<EOF
-exec fakeroot gdb --quiet -ex run "${DPKG:-dpkg}" --args "${DPKG:-dpkg}" --root="${TMPWORKINGDIRECTORY}/rootdir" \\
-	--log="${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log" \\
+exec fakeroot gdb --quiet -ex run '${DPKG:-dpkg}' --args '${DPKG:-dpkg}' --root='${TMPWORKINGDIRECTORY}/rootdir' \\
+	--log='${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log' \\
 	--force-not-root --force-bad-path "\$@"
 EOF
 	chmod +x "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg"
@@ -353,6 +369,7 @@ EOF
 		if ! command dpkg --assert-multi-arch >/dev/null 2>&1; then
 			echo "DPKG::options:: \"--force-architecture\";" # Added to test multiarch before dpkg is ready for it…
 		fi
+		echo 'quiet "0";'
 		echo 'quiet::NoUpdate "true";'
 		echo 'quiet::NoStatistic "true";'
 		# too distracting for users, but helpful to detect changes
@@ -361,6 +378,8 @@ EOF
 		# in testcases, it can appear as if localhost has a rotation setup,
 		# hide this as we can't really deal with it properly
 		echo 'Acquire::Failure::ShowIP "false";'
+		# fakeroot can't fake everything, so disabled in production but good for tests
+		echo 'APT::Sandbox::Verify "true";'
 	} >> aptconfig.conf
 
 	cp "${TESTDIRECTORY}/apt.pem" "${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem"
@@ -369,27 +388,25 @@ EOF
 	fi
 	echo "Acquire::https::CaInfo \"${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem\";" > rootdir/etc/apt/apt.conf.d/99https
 	echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary
+	echo 'Acquire::Connect::AddrConfig "false";' > rootdir/etc/apt/apt.conf.d/connect-addrconfig
 	configcompression '.' 'gz' #'bz2' 'lzma' 'xz'
 	confighashes 'SHA1' # these are tests, not security best-practices
 
 	# create some files in /tmp and look at user/group to get what this means
-	TEST_DEFAULT_USER="$USER"
+	TEST_DEFAULT_USER="$(id -un)"
 	if [ "$(uname)" = 'GNU/kFreeBSD' ]; then
 		TEST_DEFAULT_GROUP='root'
 	else
-		TEST_DEFAULT_GROUP="$USER"
+		TEST_DEFAULT_GROUP="$(id -gn)"
 	fi
 
-        # Acquire::AllowInsecureRepositories=false is not yet the default
-        # but we want it to be the default soon
-        configallowinsecurerepositories "false";
-
 	# cleanup the environment a bit
-        # prefer our apt binaries over the system apt binaries
+	# prefer our apt binaries over the system apt binaries
 	export PATH="${BUILDDIRECTORY}:${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
 	export LC_ALL=C.UTF-8
 	unset LANGUAGE APT_CONFIG
 	unset GREP_OPTIONS DEB_BUILD_PROFILES
+	unset http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy
 	msgdone "info"
 }
 
@@ -485,25 +502,23 @@ int execvp(const char *file, char *const argv[]) {
 	if (chrootdir == NULL || strncmp(file, "/var/lib/dpkg/", strlen("/var/lib/dpkg/")) != 0)
 		return func_execvp(file, argv);
 	printf("REWRITE execvp call %s into %s\n", file, chrootdir);
-	char newfile[strlen(chrootdir) + strlen(file)];
-	strcpy(newfile, chrootdir);
-	strcat(newfile, file);
+	char *newfile;
+	if (asprintf(&newfile, "%s%s", chrootdir, file) == -1) {
+		perror("asprintf");
+		return -1;
+	}
 	char const * const baseadmindir = "/var/lib/dpkg";
-	char admindir[strlen(chrootdir) + strlen(baseadmindir)];
-	strcpy(admindir, chrootdir);
-	strcat(admindir, baseadmindir);
+	char *admindir;
+	if (asprintf(&admindir, "%s%s", chrootdir, baseadmindir) == -1) {
+		perror("asprintf");
+		return -1;
+	}
 	setenv("DPKG_ADMINDIR", admindir, 1);
 	return func_execvp(newfile, argv);
 }
 EOF
-	testsuccess --nomsg gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl
+	testsuccess --nomsg gcc -Wall -fPIC -shared -o noopchroot.so noopchroot.c -ldl
 }
-
-configallowinsecurerepositories() {
-    echo "Acquire::AllowInsecureRepositories \"$1\";" >  rootdir/etc/apt/apt.conf.d/allow-insecure-repositories.conf
-
-}
-
 configcompression() {
 	while [ -n "$1" ]; do
 		case "$1" in
@@ -572,7 +587,7 @@ setupsimplenativepackage() {
 	local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
  If you find such a package installed on your system,
  something went horribly wrong! They are autogenerated
- und used only by testcases and surf no other propose…"}"
+ und used only by testcases and serve no other purpose…"}"
 
 	local SECTION="${7:-others}"
 	local DISTSECTION
@@ -628,7 +643,7 @@ buildsimplenativepackage() {
 	local DESCRIPTION="${6:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
  If you find such a package installed on your system,
  something went horribly wrong! They are autogenerated
- und used only by testcases and surf no other propose…"}"
+ und used only by testcases and serve no other purpose…"}"
 
 	local SECTION="${7:-others}"
 	local PRIORITY="${8:-optional}"
@@ -776,7 +791,7 @@ EOF
 	for DIST in $(find ./pool/ -maxdepth 1 -name '*.pkglist' -type f | cut -d'/' -f 3 | cut -d'.' -f 1 | sort | uniq); do
 		cat <<EOF
 tree "dists/$DIST" {
-	Architectures "$ARCHS source";
+	Architectures "$ARCHS all source";
 	FileList "${DIST}.\$(SECTION).pkglist";
 	SourceFileList "${DIST}.\$(SECTION).srclist";
 	Sections "$(find ./pool/ -maxdepth 1 -name "${DIST}.*.pkglist" -type f | cut -d'/' -f 3 | cut -d'.' -f 2 | sort | uniq | tr '\n' ' ')";
@@ -810,7 +825,7 @@ insertpackage() {
 	local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/${RELEASES}
  If you find such a package installed on your system,
  something went horribly wrong! They are autogenerated
- und used only by testcases and surf no other propose…"}"
+ und used only by testcases and serve no other purpose…"}"
 	local ARCHS=""
 	for RELEASE in $(printf '%s' "$RELEASES" | tr ',' '\n'); do
 		if [ "$RELEASE" = 'installed' ]; then
@@ -818,7 +833,7 @@ insertpackage() {
 			continue
 		fi
 		for arch in $(getarchitecturesfromcommalist "$ARCH"); do
-			if [ "$arch" = 'all' -o "$arch" = 'none' ]; then
+			if [ "$arch" = 'none' ]; then
 				ARCHS="$(getarchitectures)"
 			else
 				ARCHS="$arch"
@@ -889,7 +904,7 @@ insertinstalledpackage() {
 	local DESCRIPTION="${7:-"an autogenerated dummy ${NAME}=${VERSION}/installed
  If you find such a package installed on your system,
  something went horribly wrong! They are autogenerated
- und used only by testcases and surf no other propose…"}"
+ und used only by testcases and serve no other purpose…"}"
 
 	local FILE='rootdir/var/lib/dpkg/status'
 	local INFO='rootdir/var/lib/dpkg/info'
@@ -964,6 +979,7 @@ getcodenamefromsuite() {
 getreleaseversionfromsuite() { true; }
 getlabelfromsuite() { true; }
 getoriginfromsuite() { true; }
+getarchitecturesfromreleasefile() { echo "all $(getarchitectures)"; }
 
 aptftparchiverelease() {
 	aptftparchive -qq release "$@" | sed -e '/0 Release$/ d' # remove the self reference
@@ -971,29 +987,24 @@ aptftparchiverelease() {
 generatereleasefiles() {
 	# $1 is the Date header and $2 is the ValidUntil header to be set
 	# both should be given in notation date/touch can understand
-	msgninfo "\tGenerate Release files… "
+	local DATE="$1"
+	local VALIDUNTIL="$2"
 	if [ -e aptarchive/dists ]; then
+		msgninfo "\tGenerate Release files for dists… "
 		for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
+			local ARCHITECTURES="$(getarchitecturesfromreleasefile "$dir")"
 			local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
 			local CODENAME="$(getcodenamefromsuite $SUITE)"
 			local VERSION="$(getreleaseversionfromsuite $SUITE)"
 			local LABEL="$(getlabelfromsuite $SUITE)"
 			local ORIGIN="$(getoriginfromsuite $SUITE)"
-			if [ -n "$VERSION" ]; then
-				VERSION="-o APT::FTPArchive::Release::Version=${VERSION}"
-			fi
-			if [ -n "$LABEL" ]; then
-				LABEL="-o APT::FTPArchive::Release::Label=${LABEL}"
-			fi
-			if [ -n "$ORIGIN" ]; then
-				ORIGIN="-o APT::FTPArchive::Release::Origin=${ORIGIN}"
-			fi
 			aptftparchiverelease "$dir" \
 				-o APT::FTPArchive::Release::Suite="${SUITE}" \
 				-o APT::FTPArchive::Release::Codename="${CODENAME}" \
-				${LABEL} \
-				${ORIGIN} \
-				${VERSION} \
+				-o APT::FTPArchive::Release::Architectures="${ARCHITECTURES}" \
+				-o APT::FTPArchive::Release::Label="${LABEL}" \
+				-o APT::FTPArchive::Release::Origin="${ORIGIN}" \
+				-o APT::FTPArchive::Release::Version="${VERSION}" \
 				> "$dir/Release"
 			if [ "$SUITE" = "experimental" -o "$SUITE" = "experimental2" ]; then
 				sed -i '/^Date: / a\
@@ -1001,17 +1012,18 @@ NotAutomatic: yes' "$dir/Release"
 			fi
 		done
 	else
+		msgninfo "\tGenerate Release files for flat… "
 		aptftparchiverelease ./aptarchive > aptarchive/Release
 	fi
-	if [ -n "$1" -a "$1" != "now" ]; then
+	if [ -n "$DATE" -a "$DATE" != "now" ]; then
 		for release in $(find ./aptarchive -name 'Release'); do
-			sed -i "s/^Date: .*$/Date: $(date -d "$1" '+%a, %d %b %Y %H:%M:%S %Z')/" "$release"
-			touch -d "$1" "$release"
+			sed -i "s/^Date: .*$/Date: $(date -d "$DATE" '+%a, %d %b %Y %H:%M:%S %Z')/" "$release"
+			touch -d "$DATE" "$release"
 		done
 	fi
-	if [ -n "$2" ]; then
+	if [ -n "$VALIDUNTIL" ]; then
 		sed -i "/^Date: / a\
-Valid-Until: $(date -d "$2" '+%a, %d %b %Y %H:%M:%S %Z')" $(find ./aptarchive -name 'Release')
+Valid-Until: $(date -d "$VALIDUNTIL" '+%a, %d %b %Y %H:%M:%S %Z')" $(find ./aptarchive -name 'Release')
 	fi
 	msgdone "info"
 }
@@ -1096,9 +1108,9 @@ signreleasefiles() {
 		fi
 	fi
 	for RELEASE in $(find "${REPODIR}/" -name Release); do
-		$GPG --default-key "$SIGNER" --armor --detach-sign --sign --output "${RELEASE}.gpg" "${RELEASE}"
+		testsuccess $GPG --default-key "$SIGNER" --armor --detach-sign --sign --output "${RELEASE}.gpg" "${RELEASE}"
 		local INRELEASE="$(echo "${RELEASE}" | sed 's#/Release$#/InRelease#')"
-		$GPG --default-key "$SIGNER" --clearsign --output "$INRELEASE" "$RELEASE"
+		testsuccess $GPG --default-key "$SIGNER" --clearsign --output "$INRELEASE" "$RELEASE"
 		# we might have set a specific date for the Release file, so copy it
 		touch -d "$(stat --format "%y" ${RELEASE})" "${RELEASE}.gpg" "${INRELEASE}"
 	done
@@ -1149,8 +1161,11 @@ webserverconfig() {
 
 rewritesourceslist() {
 	local APTARCHIVE="file://$(readlink -f "${TMPWORKINGDIRECTORY}/aptarchive" | sed 's# #%20#g')"
+	local APTARCHIVE2="copy://$(readlink -f "${TMPWORKINGDIRECTORY}/aptarchive" | sed 's# #%20#g')"
 	for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do
-		sed -i $LIST -e "s#$APTARCHIVE#${1}#" -e "s#http://localhost:${APTHTTPPORT}/#${1}#" -e "s#https://localhost:${APTHTTPSPORT}/#${1}#"
+		sed -i $LIST -e "s#$APTARCHIVE#${1}#" -e "s#$APTARCHIVE2#${1}#" \
+			-e "s#http://localhost:${APTHTTPPORT}/#${1}#" \
+			-e "s#https://localhost:${APTHTTPSPORT}/#${1}#"
 	done
 }
 
@@ -1179,7 +1194,7 @@ changetowebserver() {
 		cd aptarchive
 		local LOG="webserver.log"
 		if ! aptwebserver --port 0 -o aptwebserver::fork=1 -o aptwebserver::portfile='aptwebserver.port' "$@" >$LOG 2>&1 ; then
-			cat $LOG
+			cat "$LOG"
 			false
 		fi
 		waitforpidfile aptwebserver.pid
@@ -1195,7 +1210,7 @@ changetowebserver() {
 		fi
 		cd - > /dev/null
 	else
-		msgdie 'You have to build aptwerbserver or install a webserver'
+		msgdie 'You have to build apt from source to have test/interactive-helper/aptwebserver available for tests requiring a webserver'
 	fi
 	if [ "$REWRTE" != 'yes' ]; then
 		rewritesourceslist "http://localhost:${APTHTTPPORT}/"
@@ -1203,7 +1218,7 @@ changetowebserver() {
 }
 
 changetohttpswebserver() {
-	if ! which stunnel4 >/dev/null; then
+	if ! command -v stunnel4 >/dev/null 2>&1; then
 		msgdie 'You need to install stunnel4 for https testcases'
 	fi
 	if [ ! -e "${TMPWORKINGDIRECTORY}/aptarchive/aptwebserver.pid" ]; then
@@ -1249,7 +1264,7 @@ EOF
 	# start with an unmounted disk
 	mv "${CD}" "${CD}-unmounted"
 	# we don't want the disk to be modifiable
-	addtrap 'prefix' "chmod -f -R +w \"$PWD/rootdir/media/cdrom/dists/\" \"$PWD/rootdir/media/cdrom-unmounted/dists/\" || true;"
+	addtrap 'prefix' "chmod -f -R +w '$(escape_shell "$PWD/rootdir/media/cdrom/dists/")' '$(escape_shell "$PWD/rootdir/media/cdrom-unmounted/dists/")' || true;"
 	chmod -R 555 rootdir/media/cdrom-unmounted/dists
 }
 
@@ -1401,7 +1416,7 @@ N: No packages found"
 	local ARCH="$(getarchitecture 'native')"
 	echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' >"$COMPAREFILE"
 	local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testshowvirtual.output"
-	testoutputequal "$COMPAREFILE" aptcache show -q=0 "$PACKAGE"
+	testoutputequal "$COMPAREFILE" aptcache show "$PACKAGE"
 	msggroup
 }
 
@@ -1418,6 +1433,19 @@ testnopackage() {
 	fi
 	msggroup
 }
+testnosrcpackage() {
+	msggroup 'testnosrcpackage'
+	msgtest "Test for non-existent source packages" "apt-cache showsrc $*"
+	local SHOWPKG="$(aptcache showsrc "$@" 2>&1 | grep '^Package: ')"
+	if [ -n "$SHOWPKG" ]; then
+		local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testnosrcpackage.output"
+		echo "$SHOWPKG" >"$OUTPUT"
+		msgfailoutput '' "$OUTPUT"
+	else
+		msgpass
+	fi
+	msggroup
+}
 
 testdpkgstatus() {
 	msggroup 'testdpkgstatus'
@@ -1495,7 +1523,10 @@ msgfailoutput() {
 			if expr match "$1" "$FILEFLAGS" >/dev/null; then
 				echo "#### stat(2) of file: $2 ####"
 				stat "$2" || true
-				if test -e "$2"; then
+				if test -d "$2"; then
+					echo "#### The directory contains: $2 ####"
+					ls >&2 "$2" || true
+				elif test -e "$2"; then
 					echo "#### Complete file: $2 ####"
 					cat >&2 "$2" || true
 				fi
@@ -1512,19 +1543,22 @@ msgfailoutput() {
 	msgfail "$MSG"
 }
 
-testsuccess() {
-	msggroup 'testsuccess'
+testsuccesswithglobalerror() {
+	local TYPE="$1"
+	local ERRORS="$2"
+	shift 2
+	msggroup "$TYPE"
 	if [ "$1" = '--nomsg' ]; then
 		shift
 	else
 		msgtest 'Test for successful execution of' "$*"
 	fi
-	local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output"
+	local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/${TYPE}.output"
 	if "$@" >"${OUTPUT}" 2>&1; then
 		if expr match "$1" '^apt.*' >/dev/null; then
 			if grep -q -E ' runtime error: ' "$OUTPUT"; then
 				msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"
-			elif grep -E '^[WE]: ' "$OUTPUT" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" 2>&1; then
+			elif grep -E "^[${ERRORS}]: " "$OUTPUT" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" 2>&1; then
 				if [ "$IGNORE_PTY_NOT_MOUNTED" = '1' ]; then
 					if echo 'E: Can not write log (Is /dev/pts mounted?) - posix_openpt (2: No such file or directory)' \
 						| cmp - "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" >/dev/null 2>&1; then
@@ -1535,6 +1569,12 @@ testsuccess() {
 				else
 					msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
 				fi
+			elif [ "$TYPE" = 'testsuccesswithnotice' ]; then
+				if grep -q -E "^N: " "$OUTPUT"; then
+					msgpass
+				else
+					msgfailoutput 'successful run, but output had no notices' "$OUTPUT" "$@"
+				fi
 			else
 				msgpass
 			fi
@@ -1545,9 +1585,15 @@ testsuccess() {
 		local EXITCODE=$?
 		msgfailoutput "exitcode $EXITCODE" "$OUTPUT" "$@"
 	fi
-	aptautotest 'testsuccess' "$@"
+	aptautotest "$TYPE" "$@"
 	msggroup
 }
+testsuccesswithnotice() {
+	testsuccesswithglobalerror 'testsuccesswithnotice' 'WE' "$@"
+}
+testsuccess() {
+	testsuccesswithglobalerror 'testsuccess' 'NWE' "$@"
+}
 testwarning() {
 	msggroup 'testwarning'
 	if [ "$1" = '--nomsg' ]; then
@@ -1619,22 +1665,41 @@ testfailure() {
 
 testreturnstateequal() {
 	local STATE="$1"
-	msggroup "${STATE}equal"
-	if [ "$2" != '--nomsg' ]; then
-		local CMP="$2"
-		shift 2
-		"$STATE" "$@"
-		testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
-	else
-		local CMP="$3"
+	if [ "$STATE" = 'testsuccesswithglobalerror' ]; then
+		local STATE="$2"
+		local TYPE="$3"
 		shift 3
-		"$STATE" --nomsg "$@"
-		testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+		msggroup "${STATE}equal"
+		if [ "$1" != '--nomsg' ]; then
+			local CMP="$1"
+			shift
+			testsuccesswithglobalerror "$STATE" "$TYPE" "$@"
+			testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+		else
+			local CMP="$2"
+			shift 2
+			testsuccesswithglobalerror "$STATE" "$TYPE" "$@"
+			testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+		fi
+	else
+		msggroup "${STATE}equal"
+		if [ "$2" != '--nomsg' ]; then
+			local CMP="$2"
+			shift 2
+			"$STATE" "$@"
+			testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+		else
+			local CMP="$3"
+			shift 3
+			"$STATE" --nomsg "$@"
+			testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+		fi
 	fi
 	msggroup
 }
 testsuccessequal() {
-	testreturnstateequal 'testsuccess' "$@"
+	# we compare output, so we know perfectly well about N:
+	testreturnstateequal 'testsuccesswithglobalerror' 'testsuccess' 'WE' "$@"
 }
 testwarningequal() {
 	testreturnstateequal 'testwarning' "$@"
@@ -1650,7 +1715,18 @@ testfailuremsg() {
 	testfailure "$@"
 	msgtest 'Check that the output of the previous failed command has expected' 'failures and warnings'
 	local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailuremsg.comparefile"
-	grep '^\(W\|E\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" > "$COMPAREFILE" 2>&1 || true
+	grep '^\(W\|E\|N\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" > "$COMPAREFILE" 2>&1 || true
+	testoutputequal "$COMPAREFILE" echo "$CMP"
+	msggroup
+}
+testwarningmsg() {
+	msggroup 'testwarningmsg'
+	local CMP="$1"
+	shift
+	testwarning "$@"
+	msgtest 'Check that the output of the previous warned command has expected' 'warnings'
+	local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarningmsg.comparefile"
+	grep '^\(W\|E\|N\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output" > "$COMPAREFILE" 2>&1 || true
 	testoutputequal "$COMPAREFILE" echo "$CMP"
 	msggroup
 }
@@ -1701,6 +1777,41 @@ testwebserverlaststatuscode() {
 	msggroup
 }
 
+createlistofkeys() {
+	local OUTPUT="$1"
+	shift
+	while [ -n "$1" ]; do
+		# gpg 2.1 has a slightly different output format
+		if grep -q ' rsa2048/' "$OUTPUT"; then
+			case "$1" in
+				*Joe*|*Sixpack*) echo 'pub   rsa2048/DBAC8DAE 2010-08-18';;
+				*Rex*|*Expired*) echo 'pub   rsa2048/27CE74F9 2013-07-12 [expired: 2013-07-13]';;
+				*Marvin*|*Paranoid*) echo 'pub   rsa2048/528144E2 2011-01-16';;
+				oldarchive) echo 'pub   rsa1024/F68C85A3 2013-12-19';;
+				newarchive) echo 'pub   rsa2048/DBAC8DAE 2010-08-18';;
+				*) echo 'UNKNOWN KEY';;
+			esac
+		else
+			case "$1" in
+				*Joe*|*Sixpack*) echo 'pub   2048R/DBAC8DAE 2010-08-18';;
+				*Rex*|*Expired*) echo 'pub   2048R/27CE74F9 2013-07-12 [expired: 2013-07-13]';;
+				*Marvin*|*Paranoid*) echo 'pub   2048R/528144E2 2011-01-16';;
+				oldarchive) echo 'pub   1024R/F68C85A3 2013-12-19';;
+				newarchive) echo 'pub   2048R/DBAC8DAE 2010-08-18';;
+				*) echo 'UNKNOWN KEY';;
+			esac
+		fi
+		shift
+	done
+}
+testaptkeys() {
+	local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/aptkeylist.output"
+	if ! aptkey list | grep '^pub' > "$OUTPUT"; then
+		echo -n > "$OUTPUT"
+	fi
+	testfileequal "$OUTPUT" "$(createlistofkeys "$OUTPUT" "$@")"
+}
+
 pause() {
 	echo "STOPPED execution. Press enter to continue"
 	local IGNORE
@@ -1721,8 +1832,8 @@ listcurrentlistsdirectory() {
 ### convenience hacks ###
 mkdir() {
 	# creating some directories by hand is a tedious task, so make it look simple
-	if [ "$*" = '-p rootdir/var/lib/apt/lists' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" ] ||
-	   [ "$*" = '-p rootdir/var/lib/apt/lists/partial' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial" ]; then
+	local PARAMS="$*"
+	if [ "$PARAMS" != "${PARAMS#*rootdir/var/lib/apt/lists}" ]; then
 		# only the last directory created by mkdir is effected by the -m !
 		command mkdir -m 755 -p "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt"
 		command mkdir -m 755 -p "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists"