aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-11-22 15:10:57 +0100
committerSiri Hansen <[email protected]>2013-11-22 15:10:57 +0100
commit6c8967fbbb0ec23eed27d34e75dea285145a1240 (patch)
treef75e3d31ac631f502c17c893da53967f7a394aed /lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
parent90c8450bb691a7b57ce326fddd1f44ef01db390f (diff)
downloadotp-6c8967fbbb0ec23eed27d34e75dea285145a1240.tar.gz
otp-6c8967fbbb0ec23eed27d34e75dea285145a1240.tar.bz2
otp-6c8967fbbb0ec23eed27d34e75dea285145a1240.zip
[common_test] Minor corrections in test of ct_netconfc
Diffstat (limited to 'lib/common_test/test/ct_netconfc_SUITE_data/ns.erl')
-rw-r--r--lib/common_test/test/ct_netconfc_SUITE_data/ns.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index 09217f60a3..fb0734d48e 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -98,8 +98,9 @@ start(Dir) ->
%% Stop the netconf server
stop(Pid) ->
- Pid ! {stop,self()},
- receive stopped -> ok end.
+ Ref = erlang:monitor(process,Pid),
+ Pid ! stop,
+ receive {'DOWN',Ref,process,Pid,_} -> ok end.
%% Set the session id for the hello message.
%% If this is not called prior to starting the session, no hello
@@ -177,9 +178,9 @@ init_server(Dir) ->
loop(Daemon) ->
receive
- {stop,From} ->
+ stop ->
ssh:stop_daemon(Daemon),
- From ! stopped;
+ ok;
{table_trans,Fun,Args,From} ->
%% Simple transaction mechanism for ets table
R = apply(Fun,Args),