aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-08 12:36:06 -0400
committerGitHub <noreply@github.com>2020-06-08 12:36:06 -0400
commitb8acc851bb472c7ea9674bf1bf8ca3812ff2ab24 (patch)
tree383a0cd2440c4ec8d8b630008b2d36efa99872bb /test
parent2869cce1d53aedfe2500f3d921fb901dd5994690 (diff)
parenta5facca78fed010552339a6644dd8ef1bb0fa229 (diff)
downloadpodman-b8acc851bb472c7ea9674bf1bf8ca3812ff2ab24.tar.gz
podman-b8acc851bb472c7ea9674bf1bf8ca3812ff2ab24.tar.bz2
podman-b8acc851bb472c7ea9674bf1bf8ca3812ff2ab24.zip
Merge pull request #6515 from vrothberg/v2-enable-ubuntu
V2 enable ubuntu
Diffstat (limited to 'test')
-rw-r--r--test/e2e/checkpoint_test.go2
-rw-r--r--test/e2e/generate_kube_test.go2
2 files changed, 4 insertions, 0 deletions
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go
index e6a3d2f7a..663205209 100644
--- a/test/e2e/checkpoint_test.go
+++ b/test/e2e/checkpoint_test.go
@@ -232,6 +232,8 @@ var _ = Describe("Podman checkpoint", func() {
})
It("podman checkpoint container with established tcp connections", func() {
+ // Broken on Ubuntu.
+ SkipIfNotFedora()
localRunString := getRunString([]string{redis})
session := podmanTest.Podman(localRunString)
session.WaitWithDefaultTimeout()
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 389f2c822..db750bfcc 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -254,6 +254,8 @@ var _ = Describe("Podman generate kube", func() {
})
It("podman generate with user and reimport kube on pod", func() {
+ // This test fails on ubuntu due to https://github.com/seccomp/containers-golang/pull/27
+ SkipIfNotFedora()
podName := "toppod"
_, rc, _ := podmanTest.CreatePod(podName)
Expect(rc).To(Equal(0))