diff options
| author | Lukas Larsson <[email protected]> | 2012-05-23 11:25:08 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-05-23 11:25:08 +0200 |
| commit | 90cbd16d39bb00c6eb4f3ffe04a406f800ee9126 (patch) | |
| tree | 8b5c7b186208b84797ec9b614443c802392133ae /lib/kernel/test/gen_tcp_misc_SUITE.erl | |
| parent | 0d98106bfa6f0c637019604f4c25e6c48cd1d5fc (diff) | |
| parent | 1ba2039020738673b3913be0e48d83713503a3b7 (diff) | |
| download | otp-90cbd16d39bb00c6eb4f3ffe04a406f800ee9126.tar.gz otp-90cbd16d39bb00c6eb4f3ffe04a406f800ee9126.tar.bz2 otp-90cbd16d39bb00c6eb4f3ffe04a406f800ee9126.zip | |
Merge branch 'maint'
* maint:
Add testcase for controlling_process(P,self())
Fix port leaking after controlling_process(Port, self())
Diffstat (limited to 'lib/kernel/test/gen_tcp_misc_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/gen_tcp_misc_SUITE.erl | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl index 0c53b1e85b..1592399996 100644 --- a/lib/kernel/test/gen_tcp_misc_SUITE.erl +++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl @@ -24,7 +24,8 @@ -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, - controlling_process/1, no_accept/1, close_with_pending_output/1, + controlling_process/1, controlling_process_self/1, + no_accept/1, close_with_pending_output/1, data_before_close/1, iter_max_socks/1, get_status/1, passive_sockets/1, accept_closed_by_other_process/1, init_per_testcase/2, end_per_testcase/2, @@ -58,7 +59,7 @@ end_per_testcase(_Func, Config) -> suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> - [controlling_process, no_accept, + [controlling_process, controlling_process_self, no_accept, close_with_pending_output, data_before_close, iter_max_socks, passive_sockets, accept_closed_by_other_process, otp_3924, closed_socket, @@ -307,6 +308,32 @@ not_owner(S) -> ok end. +controlling_process_self(doc) -> + ["Open a listen port and assign the controlling process to " + "it self, then exit and make sure the port is closed properly."]; +controlling_process_self(Config) when is_list(Config) -> + S = self(), + process_flag(trap_exit,true), + spawn_link(fun() -> + {ok,Sock} = gen_tcp:listen(0,[]), + S ! {socket, Sock}, + ok = gen_tcp:controlling_process(Sock,self()), + S ! done + end), + receive + done -> + receive + {socket,Sock} -> + process_flag(trap_exit,false), + %% Make sure the port is invalid after process crash + {error,einval} = inet:port(Sock) + end; + Msg when element(1,Msg) /= socket -> + process_flag(trap_exit,false), + exit({unknown_msg,Msg}) + end. + + no_accept(doc) -> ["Open a listen port and connect to it, then close the listen port ", "without doing any accept. The connected socket should receive ", |