diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-22 18:59:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 18:59:30 +0100 |
| commit | e3a7a743c50f7131fde98380b8059c463468c653 (patch) | |
| tree | 3f1a1b54bbce0126b534f1bc2c369e54f96253ff /test/system | |
| parent | 72031783c5152cc715a8f1b6dc39bb5de8bfc3ca (diff) | |
| parent | fe30b30458098c2d4f97e3cf5513870a6bac8e06 (diff) | |
| download | podman-e3a7a743c50f7131fde98380b8059c463468c653.tar.gz podman-e3a7a743c50f7131fde98380b8059c463468c653.tar.bz2 podman-e3a7a743c50f7131fde98380b8059c463468c653.zip | |
Merge pull request #12383 from edsantiago/flake_fixes
[v3.4] backport Flake fixes
Diffstat (limited to 'test/system')
| -rw-r--r-- | test/system/500-networking.bats | 2 |
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 |