summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-11-15 16:42:40 +0100
committerGitHub <noreply@github.com>2021-11-15 16:42:40 +0100
commit9eaa6f4566eff75f5710c48ae0ba3d98840a50a9 (patch)
treed86561dbed85e8e7bd4b7a778bea38c377d214f8
parente9d8ca22b8ea5923d6188225cd2d2254bdc4d898 (diff)
parentc21259bf86cfd6a9d5ba2ca6326e3dc57b5b2e0f (diff)
downloadpodman-9eaa6f4566eff75f5710c48ae0ba3d98840a50a9.tar.gz
podman-9eaa6f4566eff75f5710c48ae0ba3d98840a50a9.tar.bz2
podman-9eaa6f4566eff75f5710c48ae0ba3d98840a50a9.zip
Merge pull request #12297 from edsantiago/no_remote_unshare
Network test: fix podman-remote-rootless corner case
-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 21350ed36..deadfa90a 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -172,7 +172,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