diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-04-04 11:48:23 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-04-04 12:27:20 -0400 |
| commit | 02c6110093ed23dd637a51611b0bce4fd4ab9ce9 (patch) | |
| tree | 101a4fbeb7b773143f576263233f3fedb589cfe3 /test/e2e | |
| parent | 1fdc89f616fead07b9b49e949f7c7cebba951070 (diff) | |
| download | podman-02c6110093ed23dd637a51611b0bce4fd4ab9ce9.tar.gz podman-02c6110093ed23dd637a51611b0bce4fd4ab9ce9.tar.bz2 podman-02c6110093ed23dd637a51611b0bce4fd4ab9ce9.zip | |
Fix E2E tests
The Commit test is blatantly wrong and testing buggy behavior. We
should be commiting the destination, if anything - and more
likely nothing at all.
When force-removing volumes, don't remove the volumes of
containers we need to remove. This can lead to a chicken and the
egg problem where the container removes the volume before we can.
When we re-add volume locks this could lead to deadlocks. I don't
really want to deal with this, and this doesn't seem a
particularly harmful quirk, so we'll let this slide until we get
a bug report.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/commit_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/volume_rm_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index bf9c88de5..fe4ae64cf 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -144,7 +144,7 @@ var _ = Describe("Podman commit", func() { inspect.WaitWithDefaultTimeout() Expect(inspect.ExitCode()).To(Equal(0)) image := inspect.InspectImageJSON() - _, ok := image[0].Config.Volumes["/tmp"] + _, ok := image[0].Config.Volumes["/foo"] Expect(ok).To(BeTrue()) r := podmanTest.Podman([]string{"run", "newimage"}) diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go index 888474670..39628d56f 100644 --- a/test/e2e/volume_rm_test.go +++ b/test/e2e/volume_rm_test.go @@ -32,7 +32,7 @@ var _ = Describe("Podman volume rm", func() { }) - It("podman rm volume", func() { + It("podman volume rm", func() { session := podmanTest.Podman([]string{"volume", "create", "myvol"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -47,7 +47,7 @@ var _ = Describe("Podman volume rm", func() { Expect(len(session.OutputToStringArray())).To(Equal(0)) }) - It("podman rm with --force flag", func() { + It("podman volume rm with --force flag", func() { SkipIfRemote() session := podmanTest.Podman([]string{"create", "-v", "myvol:/myvol", ALPINE, "ls"}) cid := session.OutputToString() |