aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/src/ct_util.erl
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2013-08-23 15:18:22 +0200
committerPeter Andersson <[email protected]>2013-09-02 12:14:01 +0200
commita5c108b7eed9badc3b0ea0b4bad3af4bf36bc55b (patch)
treed7649e79683998dd043e19422583e916da7a56ef /lib/common_test/src/ct_util.erl
parent614ba49d9ff9c75466bc3bba5b25a2e583e09217 (diff)
downloadotp-a5c108b7eed9badc3b0ea0b4bad3af4bf36bc55b.tar.gz
otp-a5c108b7eed9badc3b0ea0b4bad3af4bf36bc55b.tar.bz2
otp-a5c108b7eed9badc3b0ea0b4bad3af4bf36bc55b.zip
Fix problem with start order of hooks and stopping of ct_util_server
Diffstat (limited to 'lib/common_test/src/ct_util.erl')
-rw-r--r--lib/common_test/src/ct_util.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index e039f68121..cbdf999cf8 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -693,8 +693,14 @@ reset_silent_connections() ->
%%% @see ct
stop(Info) ->
case whereis(ct_util_server) of
- undefined -> ok;
- _ -> call({stop,Info})
+ undefined ->
+ ok;
+ CtUtilPid ->
+ Ref = monitor(process, CtUtilPid),
+ call({stop,Info}),
+ receive
+ {'DOWN',Ref,_,_,_} -> ok
+ end
end.
%%%-----------------------------------------------------------------