From 2624c043d1b8aef69355616037ee2305298bd08a Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Tue, 19 May 2020 13:34:01 -0500 Subject: Test fixes for remote integration Signed-off-by: Brent Baude --- test/e2e/common_test.go | 2 +- test/e2e/create_test.go | 4 ++-- test/e2e/images_test.go | 10 +++++----- test/e2e/kill_test.go | 2 +- test/e2e/manifest_test.go | 4 +++- test/e2e/pause_test.go | 3 --- test/e2e/save_test.go | 1 - test/e2e/stop_test.go | 1 - test/e2e/untag_test.go | 2 +- 9 files changed, 13 insertions(+), 16 deletions(-) (limited to 'test') diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 6d6f1762d..80ee83f44 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -35,7 +35,7 @@ var ( INTEGRATION_ROOT string CGROUP_MANAGER = "systemd" ARTIFACT_DIR = "/tmp/.artifacts" - RESTORE_IMAGES = []string{ALPINE, BB} + RESTORE_IMAGES = []string{ALPINE, BB, nginx} defaultWaitTimeout = 90 ) diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index 2992d8c88..ef1dfa134 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -239,11 +239,11 @@ var _ = Describe("Podman create", func() { }) It("podman create --pull", func() { - session := podmanTest.PodmanNoCache([]string{"create", "--pull", "never", "--name=foo", "nginx"}) + session := podmanTest.PodmanNoCache([]string{"create", "--pull", "never", "--name=foo", "debian"}) session.WaitWithDefaultTimeout() Expect(session).To(ExitWithError()) - session = podmanTest.PodmanNoCache([]string{"create", "--pull", "always", "--name=foo", "nginx"}) + session = podmanTest.PodmanNoCache([]string{"create", "--pull", "always", "--name=foo", "debian"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) }) diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 542f7f1e1..cd281e3c7 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -90,7 +90,7 @@ var _ = Describe("Podman images", func() { session = podmanTest.PodmanNoCache([]string{"images", "-qn"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 2)) + Expect(len(session.OutputToStringArray())).To(BeNumerically("==", 3)) }) It("podman images with digests", func() { @@ -164,13 +164,13 @@ var _ = Describe("Podman images", func() { retapline := podmanTest.PodmanNoCache([]string{"images", "-f", "reference=a*pine"}) retapline.WaitWithDefaultTimeout() Expect(retapline).Should(Exit(0)) - Expect(len(retapline.OutputToStringArray())).To(Equal(2)) + Expect(len(retapline.OutputToStringArray())).To(Equal(3)) Expect(retapline.LineInOutputContains("alpine")).To(BeTrue()) retapline = podmanTest.PodmanNoCache([]string{"images", "-f", "reference=alpine"}) retapline.WaitWithDefaultTimeout() Expect(retapline).Should(Exit(0)) - Expect(len(retapline.OutputToStringArray())).To(Equal(2)) + Expect(len(retapline.OutputToStringArray())).To(Equal(3)) Expect(retapline.LineInOutputContains("alpine")).To(BeTrue()) retnone := podmanTest.PodmanNoCache([]string{"images", "-q", "-f", "reference=bogus"}) @@ -321,12 +321,12 @@ ENV foo=bar session := podmanTest.PodmanNoCache([]string{"images"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(len(session.OutputToStringArray())).To(Equal(4)) + Expect(len(session.OutputToStringArray())).To(Equal(5)) session2 := podmanTest.PodmanNoCache([]string{"images", "--all"}) session2.WaitWithDefaultTimeout() Expect(session2).Should(Exit(0)) - Expect(len(session2.OutputToStringArray())).To(Equal(6)) + Expect(len(session2.OutputToStringArray())).To(Equal(7)) }) It("podman images filter by label", func() { diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index b0f9cd900..3f192fb55 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -100,7 +100,7 @@ var _ = Describe("Podman kill", func() { }) It("podman kill latest container", func() { - Skip(v2remotefail) + SkipIfRemote() session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index a1decde7d..c47e20276 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -28,7 +28,6 @@ var _ = Describe("Podman manifest", func() { ) BeforeEach(func() { - Skip(v2remotefail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) @@ -103,6 +102,7 @@ var _ = Describe("Podman manifest", func() { }) It("podman manifest annotate", func() { + SkipIfRemote() session := podmanTest.Podman([]string{"manifest", "create", "foo"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -155,6 +155,7 @@ var _ = Describe("Podman manifest", func() { }) It("podman manifest push", func() { + Skip(v2remotefail) session := podmanTest.Podman([]string{"manifest", "create", "foo"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -184,6 +185,7 @@ var _ = Describe("Podman manifest", func() { }) It("podman manifest push purge", func() { + Skip(v2remotefail) session := podmanTest.Podman([]string{"manifest", "create", "foo"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index 162138a43..2faa4bc3f 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -132,7 +132,6 @@ var _ = Describe("Podman pause", func() { }) It("podman remove a paused container by id without force", func() { - Skip(v2remotefail) session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -175,7 +174,6 @@ var _ = Describe("Podman pause", func() { }) It("podman stop a paused container by id", func() { - Skip(v2remotefail) session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -272,7 +270,6 @@ var _ = Describe("Podman pause", func() { }) It("Pause a bunch of running containers", func() { - Skip(v2remotefail) for i := 0; i < 3; i++ { name := fmt.Sprintf("test%d", i) run := podmanTest.Podman([]string{"run", "-dt", "--name", name, nginx}) diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index 69454f6a9..aaa5ae180 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -68,7 +68,6 @@ var _ = Describe("Podman save", func() { }) It("podman save bogus image", func() { - Skip(v2remotefail) outfile := filepath.Join(podmanTest.TempDir, "alpine.tar") save := podmanTest.PodmanNoCache([]string{"save", "-o", outfile, "FOOBAR"}) diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index 8c845e90a..8e49e3bd0 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -198,7 +198,6 @@ var _ = Describe("Podman stop", func() { }) It("podman stop all containers with one stopped", func() { - Skip(v2remotefail) session := podmanTest.RunTopContainer("test1") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go index c61f57a9c..43b874d47 100644 --- a/test/e2e/untag_test.go +++ b/test/e2e/untag_test.go @@ -59,7 +59,7 @@ var _ = Describe("Podman untag", func() { results := podmanTest.PodmanNoCache([]string{"images"}) results.WaitWithDefaultTimeout() Expect(results.ExitCode()).To(Equal(0)) - Expect(results.OutputToStringArray()).To(HaveLen(5)) + Expect(results.OutputToStringArray()).To(HaveLen(6)) Expect(results.LineInOuputStartsWith("docker.io/library/alpine")).To(BeTrue()) Expect(results.LineInOuputStartsWith("localhost/foo")).To(BeTrue()) Expect(results.LineInOuputStartsWith("localhost/bar")).To(BeTrue()) -- cgit v1.2.3-54-g00ecf