diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-25 21:32:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 21:32:20 +0100 |
| commit | 6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b (patch) | |
| tree | 485ed1b7ce86431008b4ff47709982a23dff6639 /pkg | |
| parent | 6a03a9a538804b406c34e75a2333045b9f7db7d5 (diff) | |
| parent | 80da73f13c69fa84055a317cb59f3a5eb1ffa09c (diff) | |
| download | podman-6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b.tar.gz podman-6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b.tar.bz2 podman-6c5591ed9d89494e166ef0ffa8a1ff36333d1a1b.zip | |
Merge pull request #3901 from cevich/support_f31
Cirrus: Support testing with F31
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/bindings/test/containers_test.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go index f6ef4abec..90b87ea91 100644 --- a/pkg/bindings/test/containers_test.go +++ b/pkg/bindings/test/containers_test.go @@ -3,10 +3,12 @@ package test_bindings import ( "context" "net/http" + "strconv" "time" "github.com/containers/libpod/pkg/bindings" "github.com/containers/libpod/pkg/bindings/containers" + "github.com/containers/libpod/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" @@ -175,6 +177,14 @@ var _ = Describe("Podman containers ", func() { }) It("podman remove a paused container by id with force", func() { + // FIXME: Skip on F31 and later + host := utils.GetHostDistributionInfo() + osVer, err := strconv.Atoi(host.Version) + Expect(err).To(BeNil()) + if host.Distribution == "fedora" && osVer >= 31 { + Skip("FIXME: https://github.com/containers/libpod/issues/5325") + } + // Removing a paused container with force should work var name = "top" bt.RunTopContainer(&name, &falseFlag, nil) |