summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-06 21:07:20 +0200
committerGitHub <noreply@github.com>2019-08-06 21:07:20 +0200
commitf0a5b7ff9944f3666c9d28e1a20f9688307fe93b (patch)
tree7578155489d1ac3b8e76f08252a75e91bfa7ec3d
parentb5618d9e354a565fb8e472208c835a36373e4fbb (diff)
parent8922dfcc76de7b12bd0ebe6323ca53ce654b8c67 (diff)
downloadpodman-f0a5b7ff9944f3666c9d28e1a20f9688307fe93b.tar.gz
podman-f0a5b7ff9944f3666c9d28e1a20f9688307fe93b.tar.bz2
podman-f0a5b7ff9944f3666c9d28e1a20f9688307fe93b.zip
Merge pull request #3733 from edsantiago/bats
pod top test: reenable
-rw-r--r--test/system/200-pod-top.bats5
1 files changed, 0 insertions, 5 deletions
diff --git a/test/system/200-pod-top.bats b/test/system/200-pod-top.bats
index 08f495fb1..10808ddb2 100644
--- a/test/system/200-pod-top.bats
+++ b/test/system/200-pod-top.bats
@@ -3,8 +3,6 @@
load helpers
@test "podman pod top - containers in different PID namespaces" {
- skip "this test is not reliable. Reenable once pod-top is fixed."
-
# With infra=false, we don't get a /pause container (we also
# don't pull k8s.gcr.io/pause )
no_infra='--infra=false'
@@ -28,9 +26,6 @@ load helpers
# By default (podman pod create w/ default --infra) there should be
# a /pause container.
- # FIXME: sometimes there is, sometimes there isn't. If anyone ever
- # actually figures this out, please either reenable this line or
- # remove it entirely.
if [ -z "$no_infra" ]; then
is "$output" ".*0 \+1 \+0 \+[0-9. ?s]\+/pause" "there is a /pause container"
fi