X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/87d6947d51717e8b0e975d913986161598a7259a..3d284148090b6349c216407bb2766bd8f6a962f0:/test/integration/framework

diff --git a/test/integration/framework b/test/integration/framework
index 7a56a9acd..3e159f6a9 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -370,6 +370,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"
@@ -383,11 +385,11 @@ EOF
 	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
 
 	# cleanup the environment a bit
@@ -572,7 +574,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 +630,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}"
@@ -810,7 +812,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
@@ -889,7 +891,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'
@@ -1195,7 +1197,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}/"
@@ -1766,8 +1768,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"