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

Switch to using --time as opposed to --timeout to better match Docker.

Browse Source 
We need to consistently use --time rather then --timeout throughout the code.
Fix locations where timeout defaults are not set correctly as well.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-03-27 16:26:36 -04:00
parent 9c7410d331
commit 3449b27cd1
20 changed files with 79 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/run_volume_test.go
View File

@ -255,7 +255,7 @@ var _ = Describe("Podman run with volumes", func() {
Expect(strings.Contains(mountOut2, volName)).To(BeTrue())
// Stop the container to unmount
podmanStopSession := podmanTest.Podman([]string{"stop", "--timeout", "0", ctrName})
podmanStopSession := podmanTest.Podman([]string{"stop", "--time", "0", ctrName})
podmanStopSession.WaitWithDefaultTimeout()
Expect(podmanStopSession.ExitCode()).To(Equal(0))