From 36b6bf119ed6c2a88bd40fb92fdbd7a30e7a0daa Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 15 Nov 2021 07:01:22 -0700 Subject: Network test: fix podman-remote-rootless corner case [Backport of #12297 into v3.4, to fix gating-test failures] Followup to #12229, in which I added a podman unshare for flake debugging. Turns out that doesn't work in podman-remote. It was not caught because CI doesn't run podman-remote rootless. Signed-off-by: Ed Santiago --- test/system/500-networking.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats index 3263f3c82..bffd21b19 100644 --- a/test/system/500-networking.bats +++ b/test/system/500-networking.bats @@ -169,7 +169,7 @@ load helpers # FIXME: debugging for #11871 run_podman exec $cid cat /etc/resolv.conf - if is_rootless; then + if is_rootless && ! is_remote; then run_podman unshare --rootless-cni cat /etc/resolv.conf fi ps uxww -- cgit v1.2.3-54-g00ecf