summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-08-31 18:19:27 -0400
committerGitHub <noreply@github.com>2020-08-31 18:19:27 -0400
commit138132e16357c1c6103e6ffa770398b663462736 (patch)
tree69aee1cbef90fbe672d2e7805e189a3fd4c1e155
parent0c076dbce5fcdc3e1994df099db77c7d51a51dec (diff)
parentd36c4e0d5d6b9c03c475f402eb67713bbe5303ad (diff)
downloadpodman-138132e16357c1c6103e6ffa770398b663462736.tar.gz
podman-138132e16357c1c6103e6ffa770398b663462736.tar.bz2
podman-138132e16357c1c6103e6ffa770398b663462736.zip
Merge pull request #7514 from edsantiago/reenable_flaky_bindings_test
bindings: reenable flaky(?) pause/unpause test
-rw-r--r--pkg/bindings/test/containers_test.go11
1 files changed, 0 insertions, 11 deletions
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index db5be4909..bf2ceab2a 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -2,7 +2,6 @@ package test_bindings
import (
"net/http"
- "strconv"
"strings"
"time"
@@ -10,7 +9,6 @@ import (
"github.com/containers/podman/v2/pkg/bindings"
"github.com/containers/podman/v2/pkg/bindings/containers"
"github.com/containers/podman/v2/pkg/specgen"
- "github.com/containers/podman/v2/test/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
@@ -182,14 +180,6 @@ 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/podman/issues/5325")
- }
-
// Removing a paused container with force should work
var name = "top"
cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
@@ -280,7 +270,6 @@ var _ = Describe("Podman containers ", func() {
})
It("podman wait to pause|unpause condition", func() {
- Skip("FIXME: https://github.com/containers/podman/issues/6518")
var (
name = "top"
exitCode int32 = -1