Quellcode durchsuchen

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
David Kalnischkies vor 10 Jahren
Ursprung
Commit
eab57e0807
1 geänderte Dateien mit 2 neuen und 2 gelöschten Zeilen
  1. 2 2
      test/integration/framework

+ 2 - 2
test/integration/framework

@@ -383,11 +383,11 @@ EOF
 	confighashes 'SHA1' # these are tests, not security best-practices
 	confighashes 'SHA1' # these are tests, not security best-practices
 
 
 	# create some files in /tmp and look at user/group to get what this means
 	# 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
 	if [ "$(uname)" = 'GNU/kFreeBSD' ]; then
 		TEST_DEFAULT_GROUP='root'
 		TEST_DEFAULT_GROUP='root'
 	else
 	else
-		TEST_DEFAULT_GROUP="$USER"
+		TEST_DEFAULT_GROUP="$(id -gn)"
 	fi
 	fi
 
 
 	# cleanup the environment a bit
 	# cleanup the environment a bit