containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13163 from myml/myml/fix-duration 

fix: Multiplication of durations
This commit is contained in:
OpenShift Merge Robot 2022-02-08 10:58:20 -05:00 committed by GitHub
parent cbd0980d5b 58adf1a835
commit 119f8bc6c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/oci_conmon_exec_linux.go
View File

@ -257,7 +257,7 @@ func (r *ConmonOCIRuntime) ExecStopContainer(ctr *Container, sessionID string, t
} }
// Wait for the PID to stop // Wait for the PID to stop
if err := waitPidStop(pid, killContainerTimeout*time.Second); err != nil { if err := waitPidStop(pid, killContainerTimeout); err != nil {
return errors.Wrapf(err, "timed out waiting for container %s exec session %s PID %d to stop after SIGKILL", ctr.ID(), sessionID, pid) return errors.Wrapf(err, "timed out waiting for container %s exec session %s PID %d to stop after SIGKILL", ctr.ID(), sessionID, pid)
} }