Skip to content

Commit

Permalink
bindings: reenable flaky(?) pause/unpause test
Browse files Browse the repository at this point in the history
Reference: containers#6518, a very-frequently-flaking CI test, disabled
a month ago (containers#7143) because it was triggering so often in CI.
Unfortunately, that seems to have simply swept the problem
under the rug. AFAICT nobody has bothered to look at the
root bug, so let's just reenable. If the problem persists,
I'll let annoyed developers squeaky-wheel 6158 so there's
some incentive to fix it. If the problem has miraculously
gone away in the last month, that's a win too.

(This test failure does not reproduce on my laptop, nor
does it lend itself to devising a simple reproducer on
a test VM.)

Also: since containers#5325 appears to have been closed as fixed,
remove a 'Skip' that references it. Unfortunately this
also requires removing a lot of other cruft. This was
an incidental oh-by-the-way addition that I thought
would be trivial but ended up causing a much larger diff.

Signed-off-by: Ed Santiago <santiago@redhat.com>
  • Loading branch information
edsantiago committed Sep 14, 2020
1 parent 1c38a7c commit 210d5cd
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions pkg/bindings/test/containers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ package test_bindings

import (
"net/http"
"strconv"
"strings"
"time"

"github.com/containers/podman/v2/libpod/define"
"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"
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 210d5cd

Please sign in to comment.