diff options
| author | Siri Hansen <[email protected]> | 2013-11-29 10:47:25 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-11-29 10:47:25 +0100 |
| commit | 3b6f02df56823a122ca12ca84eda52c436f78e44 (patch) | |
| tree | b3594b85da362d588b74601078e10e9d712ae1a5 /lib/common_test/test | |
| parent | 0279799e4f3d2404f657863d04d8c1d6f6c08985 (diff) | |
| parent | 70039d8c87a0af63e865cdfd91c809c274b590d1 (diff) | |
| download | otp-3b6f02df56823a122ca12ca84eda52c436f78e44.tar.gz otp-3b6f02df56823a122ca12ca84eda52c436f78e44.tar.bz2 otp-3b6f02df56823a122ca12ca84eda52c436f78e44.zip | |
Merge branch 'siri/cuddle-with-tests' into maint
* siri/cuddle-with-tests:
[observer] Fix copy/paste error in observer_SUITE:app_file/1
[common_test] Minor corrections in test of ct_netconfc
Diffstat (limited to 'lib/common_test/test')
| -rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | 5 | ||||
| -rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE_data/ns.erl | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl index 6ee7fdd6f6..7acc05d5b2 100644 --- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl +++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl @@ -143,11 +143,10 @@ init_per_suite(Config) -> end. end_per_suite(Config) -> - PrivDir = ?config(priv_dir, Config), ?NS:stop(?config(server,Config)), ssh:stop(), crypto:stop(), - remove_id_keys(PrivDir), + remove_id_keys(Config), Config. hello(Config) -> @@ -698,7 +697,7 @@ timeout_receive_chunked_data(Config) -> ?ok = ct_netconfc:close_session(Client), ok. -%% Same as receive_chunked_data, but timeout waiting for last part. +%% Same as receive_chunked_data, but close while waiting for last part. close_while_waiting_for_chunked_data(Config) -> DataDir = ?config(data_dir,Config), {ok,Client} = open_success(DataDir), 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), |