diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2015-12-28 13:01:54 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2015-12-28 13:04:05 +0100 |
| commit | b4a59f4ee6e3650e8b7bacb0aa492f9cd0491d36 (patch) | |
| tree | 25a88f34b6bd2538acaef6c0862e519a1f40f399 /ipc/ipc.go | |
| parent | 4eda9b07e5f25565333fdd8eed4e33850bd0f828 (diff) | |
ipc: increase timeout in tests
IPC timeout must be larger than executor timeout.
Otherwise IPC kills parent executor but does not
kill child executor.
Diffstat (limited to 'ipc/ipc.go')
| -rw-r--r-- | ipc/ipc.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ipc/ipc.go b/ipc/ipc.go index 7e4ba7ca1..85904d2fa 100644 --- a/ipc/ipc.go +++ b/ipc/ipc.go @@ -46,6 +46,11 @@ const ( ) func MakeEnv(bin string, timeout time.Duration, flags uint64) (*Env, error) { + // IPC timeout must be larger then executor timeout. + // Otherwise IPC will kill parent executor but leave child executor alive. + if timeout < 7*time.Second { + timeout = 7 * time.Second + } inf, inmem, err := createMapping(2 << 20) if err != nil { return nil, err |