diff options
| author | Simon McVittie <smcv@collabora.com> | 2023-02-23 10:00:47 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2023-02-23 12:17:59 +0000 |
| commit | 140936fd73937b105051f978f9443c3b1c7253dc (patch) | |
| tree | 63930bf6a05e1df6eba3b128450f6dda5354e95d | |
| parent | a319fd5dc323e9cc5988922c8d8a5efdfbb2160b (diff) | |
| download | bubblewrap-140936fd73937b105051f978f9443c3b1c7253dc.tar.gz | |
tests: Explicitly unshare userns when testing --disable-userns
If we're running the tests as uid 0 with capabilities, then bwrap will
not create a new user namespace by default, which means the limit won't
be exceeded and the test will fail. Make sure we always try to create
the new user namespace.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rwxr-xr-x | tests/test-run.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-run.sh b/tests/test-run.sh index 979480e..171e5d4 100755 --- a/tests/test-run.sh +++ b/tests/test-run.sh @@ -129,9 +129,9 @@ else ! $BWRAP --assert-userns-disabled --dev-bind / / -- true $BWRAP --unshare-user --disable-userns --dev-bind / / -- true ! $BWRAP --unshare-user --disable-userns --dev-bind / / -- $BWRAP --dev-bind / / -- true - $BWRAP --unshare-user --disable-userns --dev-bind / / -- sh -c "echo 2 > /proc/sys/user/max_user_namespaces || true; ! $BWRAP --dev-bind / / -- true" - $BWRAP --unshare-user --disable-userns --dev-bind / / -- sh -c "echo 100 > /proc/sys/user/max_user_namespaces || true; ! $BWRAP --dev-bind / / -- true" - $BWRAP --unshare-user --disable-userns --dev-bind / / -- sh -c "! $BWRAP --dev-bind / / --assert-userns-disabled -- true" + $BWRAP --unshare-user --disable-userns --dev-bind / / -- sh -c "echo 2 > /proc/sys/user/max_user_namespaces || true; ! $BWRAP --unshare-user --dev-bind / / -- true" + $BWRAP --unshare-user --disable-userns --dev-bind / / -- sh -c "echo 100 > /proc/sys/user/max_user_namespaces || true; ! $BWRAP --unshare-user --dev-bind / / -- true" + $BWRAP --unshare-user --disable-userns --dev-bind / / -- sh -c "! $BWRAP --unshare-user --dev-bind / / --assert-userns-disabled -- true" echo "ok - can disable nested userns" fi |