diff options
| author | Peter Andersson <[email protected]> | 2014-11-11 16:36:49 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-11-11 16:36:49 +0100 |
| commit | 19f5722c9fb31ed88c45de1f17221941edaebd2f (patch) | |
| tree | de78ae0fbe940cad28b5ca79c5b5395a8d636557 /lib/stdlib/test | |
| parent | 257c61347a270d8b837224e191c57b9e5b50c483 (diff) | |
| parent | 2f9fdd45fa120fb535252a79c50ec64dbf1f9972 (diff) | |
| download | otp-19f5722c9fb31ed88c45de1f17221941edaebd2f.tar.gz otp-19f5722c9fb31ed88c45de1f17221941edaebd2f.tar.bz2 otp-19f5722c9fb31ed88c45de1f17221941edaebd2f.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/stdlib/test')
| -rw-r--r-- | lib/stdlib/test/gen_server_SUITE.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl index 8b6654dd5e..30dabf63c5 100644 --- a/lib/stdlib/test/gen_server_SUITE.erl +++ b/lib/stdlib/test/gen_server_SUITE.erl @@ -378,7 +378,9 @@ crash(Config) when is_list(Config) -> receive {error,_GroupLeader4,{Pid4, "** Generic server"++_, - [Pid4,crash,{formatted, state4},crashed]}} -> + [Pid4,crash,{formatted, state4}, + {crashed,[{?MODULE,handle_call,3,_} + |_Stacktrace]}]}} -> ok; Other4a -> ?line io:format("Unexpected: ~p", [Other4a]), @@ -1129,7 +1131,9 @@ error_format_status(Config) when is_list(Config) -> receive {error,_GroupLeader,{Pid, "** Generic server"++_, - [Pid,crash,{formatted, State},crashed]}} -> + [Pid,crash,{formatted, State}, + {crashed,[{?MODULE,handle_call,3,_} + |_Stacktrace]}]}} -> ok; Other -> ?line io:format("Unexpected: ~p", [Other]), @@ -1151,7 +1155,9 @@ terminate_crash_format(Config) when is_list(Config) -> receive {error,_GroupLeader,{Pid, "** Generic server"++_, - [Pid,stop, {formatted, State},{crash, terminate}]}} -> + [Pid,stop, {formatted, State}, + {{crash, terminate},[{?MODULE,terminate,2,_} + |_Stacktrace]}]}} -> ok; Other -> io:format("Unexpected: ~p", [Other]), |