From a60b4cc1d8d06782b4df13a08ea6440e27809d0b Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 25 Aug 2020 07:18:05 -0600 Subject: run test: use explicit uid/gid Fixes Fedora gating test failure: if the host tests are running under UID 1000, --userns=keep-id will (of course) add current user as 1000, and the in-container 'adduser' will assign 1001. To prevent that, assign UID 4242 (and hope that that's not our calling user's UID). Signed-off-by: Ed Santiago --- test/system/030-run.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 12c82bc4c..5e0ab3d6a 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -286,10 +286,10 @@ echo $rand | 0 | $rand cid="$output" gecos="$(random_string 6) $(random_string 8)" - run_podman exec --user root $cid adduser -D -g "$gecos" -s /bin/sh newuser3 + run_podman exec --user root $cid adduser -u 4242 -G ping -D -g "$gecos" -s /bin/sh newuser3 is "$output" "" "output from adduser" run_podman exec $cid tail -1 /etc/passwd - is "$output" "newuser3:x:1000:1000:$gecos:/home/newuser3:/bin/sh" \ + is "$output" "newuser3:x:4242:999:$gecos:/home/newuser3:/bin/sh" \ "newuser3 added to /etc/passwd in container" run_podman exec $cid touch /stop -- cgit v1.2.3-54-g00ecf