aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2021-11-15 07:01:22 -0700
committerEd Santiago <santiago@redhat.com>2021-11-22 08:24:44 -0700
commit36b6bf119ed6c2a88bd40fb92fdbd7a30e7a0daa (patch)
tree3bee7029d51abbac20c7b97c6f2d8e36ce3dfc0e /test
parent25f35ac9e82865650cfe239f68d0c0bd80781bce (diff)
downloadpodman-36b6bf119ed6c2a88bd40fb92fdbd7a30e7a0daa.tar.gz
podman-36b6bf119ed6c2a88bd40fb92fdbd7a30e7a0daa.tar.bz2
podman-36b6bf119ed6c2a88bd40fb92fdbd7a30e7a0daa.zip
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 <santiago@redhat.com>
Diffstat (limited to 'test')
-rw-r--r--test/system/500-networking.bats2
1 files changed, 1 insertions, 1 deletions
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