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 | |
| 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')
| -rw-r--r-- | test/e2e/config.go | 2 | ||||
| -rw-r--r-- | test/e2e/images_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 2 | ||||
| -rw-r--r-- | test/system/500-networking.bats | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/e2e/config.go b/test/e2e/config.go index 2552595ad..9c810575b 100644 --- a/test/e2e/config.go +++ b/test/e2e/config.go @@ -2,7 +2,7 @@ package integration var ( redis = "quay.io/libpod/redis:alpine" - fedoraMinimal = "quay.io/libpod/fedora-minimal:latest" + fedoraMinimal = "registry.fedoraproject.org/fedora-minimal:34" ALPINE = "quay.io/libpod/alpine:latest" ALPINELISTTAG = "quay.io/libpod/alpine:3.10.2" ALPINELISTDIGEST = "quay.io/libpod/alpine@sha256:fa93b01658e3a5a1686dc3ae55f170d8de487006fb53a28efcd12ab0710a2e5f" diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index b4ec7447e..3a9f3f513 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -144,7 +144,7 @@ var _ = Describe("Podman images", func() { result := podmanTest.Podman([]string{"images", "-q", "-f", "reference=quay.io*"}) result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) - Expect(len(result.OutputToStringArray())).To(Equal(8)) + Expect(len(result.OutputToStringArray())).To(Equal(7)) retalpine := podmanTest.Podman([]string{"images", "-f", "reference=a*pine"}) retalpine.WaitWithDefaultTimeout() diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index ca39989cd..8f640eacf 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -1457,7 +1457,7 @@ USER mail`, BB) }) It("podman run --privileged and --group-add", func() { - groupName := "kvm" + groupName := "mail" session := podmanTest.Podman([]string{"run", "-t", "-i", "--group-add", groupName, "--privileged", fedoraMinimal, "groups"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) 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 |