Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libpod/container_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ func (c *Container) Export(out io.Writer) error {
return fmt.Errorf("cannot mount container %s as it is being removed: %w", c.ID(), define.ErrCtrStateInvalid)
}

defer c.newContainerEvent(events.Mount)
defer c.newContainerEvent(events.Export)
return c.export(out)
}

Expand Down
18 changes: 18 additions & 0 deletions test/e2e/export_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,22 @@ var _ = Describe("Podman export", func() {
result.WaitWithDefaultTimeout()
Expect(result).To(ExitWithError(125, "invalid filename (should not contain ':')"))
})

It("podman export emits export event", func() {
_, ec, cid := podmanTest.RunLsContainer("")
Expect(ec).To(Equal(0))

outfile := filepath.Join(podmanTest.TempDir, "container.tar")
result := podmanTest.Podman([]string{"export", "-o", outfile, cid})
result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly())

eventsResult := podmanTest.Podman([]string{"events", "--stream=false", "--filter", "event=export", "--since", "30s"})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

anytime i see a time based anything on our CI, I think flakes. That said, I cannot think of a better way to do this without some sort of a wait, and casting a broader event search ... then iterating in the slice for what you are looking for in lines 69-70. Not a deal breaker rn I dont think though...

eventsResult.WaitWithDefaultTimeout()
Expect(eventsResult).Should(ExitCleanly())
events := eventsResult.OutputToStringArray()
Expect(events).ToNot(BeEmpty(), "export event should be present")
Expect(events[0]).To(ContainSubstring("export"))
Expect(events[0]).To(ContainSubstring(cid))
})
})