From deee4f033f190e59eedc82e73b94b6b4b97d0a6f Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 22 Nov 2019 13:09:50 -0800 Subject: id.test: fix tests on Mac. BSDs call the root group "wheel" instead. Also remove the duplicated "id id" from the progress output. --- tests/id.test | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/id.test b/tests/id.test index 32f26191..b4b13a6e 100755 --- a/tests/id.test +++ b/tests/id.test @@ -4,15 +4,18 @@ #testing "name" "command" "result" "infile" "stdin" -testing "id 0" "id 0 | sed 's/ context=.*//g'" \ - "uid=0(root) gid=0(root) groups=0(root)\n" "" "" -testing "id root" "id root | sed 's/ context=.*//g'" \ +# Systems with SELinux will have security context cruft, +# and BSDs call the root group "wheel" instead. +CLEAN="sed 's/ context=.*//g' | sed 's/wheel/root/g'" + +testing "0" "id 0 | $CLEAN" "uid=0(root) gid=0(root) groups=0(root)\n" "" "" +testing "root" "id root | $CLEAN" \ "uid=0(root) gid=0(root) groups=0(root)\n" "" "" -testing "id -G root" "id -G root" "0\n" "" "" -testing "id -nG root" "id -nG root" "root\n" "" "" -testing "id -g root" "id -g root" "0\n" "" "" -testing "id -ng root" "id -ng root" "root\n" "" "" -testing "id -u root" "id -u root" "0\n" "" "" -testing "id -nu root" "id -nu root" "root\n" "" "" -testing "id no-such-user" "id no-such-user 2>/dev/null ; echo \$?" "1\n" "" "" -testing "id 2147483647" "id 2147483647 2>/dev/null ; echo \$?" "1\n" "" "" +testing "-G root" "id -G root" "0\n" "" "" +testing "-nG root" "id -nG root | $CLEAN" "root\n" "" "" +testing "-g root" "id -g root" "0\n" "" "" +testing "-ng root" "id -ng root | $CLEAN" "root\n" "" "" +testing "-u root" "id -u root" "0\n" "" "" +testing "-nu root" "id -nu root" "root\n" "" "" +testing "no-such-user" "id no-such-user 2>/dev/null ; echo \$?" "1\n" "" "" +testing "2147483647" "id 2147483647 2>/dev/null ; echo \$?" "1\n" "" "" -- cgit v1.2.3