opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-03 12:17:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix E2E tests

Browse Source 
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>
This commit is contained in:
Matthew Heon
2019-04-04 11:48:23 -04:00
parent 1fdc89f616
commit 02c6110093
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/runtime_volume_linux.go
View File

@ -116,7 +116,7 @@ func (r *Runtime) removeVolume(ctx context.Context, v *Volume, force bool) error
// containers? // containers?
// I'm inclined to say no, in case someone accidentally // I'm inclined to say no, in case someone accidentally
// wipes a container they're using... // wipes a container they're using...
if err := r.removeContainer(ctx, ctr, false, true); err != nil { if err := r.removeContainer(ctx, ctr, false, false); err != nil {
return errors.Wrapf(err, "error removing container %s that depends on volume %s", ctr.ID(), v.Name()) return errors.Wrapf(err, "error removing container %s that depends on volume %s", ctr.ID(), v.Name())
} }
} }

2
test/e2e/commit_test.go
View File

@ -144,7 +144,7 @@ var _ = Describe("Podman commit", func() {
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect.ExitCode()).To(Equal(0)) Expect(inspect.ExitCode()).To(Equal(0))
image := inspect.InspectImageJSON() image := inspect.InspectImageJSON()
_, ok := image[0].Config.Volumes["/tmp"] _, ok := image[0].Config.Volumes["/foo"]
Expect(ok).To(BeTrue()) Expect(ok).To(BeTrue())
r := podmanTest.Podman([]string{"run", "newimage"}) r := podmanTest.Podman([]string{"run", "newimage"})

4
test/e2e/volume_rm_test.go
View File

@ -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 := podmanTest.Podman([]string{"volume", "create", "myvol"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session.ExitCode()).To(Equal(0))
@ -47,7 +47,7 @@ var _ = Describe("Podman volume rm", func() {
Expect(len(session.OutputToStringArray())).To(Equal(0)) Expect(len(session.OutputToStringArray())).To(Equal(0))
}) })
It("podman rm with --force flag", func() { It("podman volume rm with --force flag", func() {
SkipIfRemote() SkipIfRemote()
session := podmanTest.Podman([]string{"create", "-v", "myvol:/myvol", ALPINE, "ls"}) session := podmanTest.Podman([]string{"create", "-v", "myvol:/myvol", ALPINE, "ls"})
cid := session.OutputToString() cid := session.OutputToString()