diff options
| author | Sverker Eriksson <[email protected]> | 2010-11-30 15:00:10 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2010-11-30 15:00:10 +0100 |
| commit | c4f7618bc0275b5eb8787edb527714d16f512f44 (patch) | |
| tree | d46e8eb09327e039d10df5239a8e86d9e0d54785 | |
| parent | 4e93980963cda309011a49baddc44d98b421822b (diff) | |
| parent | b7c888a9a89ea2bf68b740a93711f1413d8a577c (diff) | |
| download | otp-c4f7618bc0275b5eb8787edb527714d16f512f44.tar.gz otp-c4f7618bc0275b5eb8787edb527714d16f512f44.tar.bz2 otp-c4f7618bc0275b5eb8787edb527714d16f512f44.zip | |
Merge branch 'sverker/unsafe_CancelIoEx/OTP-8937' into dev
* sverker/unsafe_CancelIoEx/OTP-8937:
Let port_SUITE:close_deaf_port wait for OS procs
| -rw-r--r-- | erts/emulator/test/port_SUITE.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl index 93f9534138..7fe532abd0 100644 --- a/erts/emulator/test/port_SUITE.erl +++ b/erts/emulator/test/port_SUITE.erl @@ -2314,13 +2314,15 @@ close_deaf_port(Config) when is_list(Config) -> ?line port_close(Port), Res = close_deaf_port_1(0, DeadPort), + io:format("Waiting for OS procs to terminate...\n"), + receive after 5*1000 -> ok end, ?line test_server:timetrap_cancel(Dog), Res. close_deaf_port_1(1000, _) -> ok; close_deaf_port_1(N, Cmd) -> - Timeout = integer_to_list(random:uniform(10*1000)), + Timeout = integer_to_list(random:uniform(5*1000)), ?line try open_port({spawn_executable,Cmd},[{args,[Timeout]}]) of Port -> ?line erlang:port_command(Port,"Hello, can you hear me!?!?"), |