From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 28 Nov 2015 00:27:49 +0000 (+0100)
Subject: tests: use id to get user/group instead of environment
X-Git-Tag: 1.1.2~9
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/eab57e0807c08fe8d3a5dcf02809c830f99fd972

tests: use id to get user/group instead of environment

debci seems to have a cleaner environment now and even if not we could
never guess nogroup, so figure it out properly via 'id'.

Git-Dch: Ignore
---

diff --git a/test/integration/framework b/test/integration/framework
index de8a65d7a..292a7b958 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -383,11 +383,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