소스 검색

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 10 년 전
부모
커밋
eab57e0807
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  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
 
 	# 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