aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2013-11-29 10:47:25 +0100
committerSiri Hansen <[email protected]>2013-11-29 10:47:25 +0100
commit3b6f02df56823a122ca12ca84eda52c436f78e44 (patch)
treeb3594b85da362d588b74601078e10e9d712ae1a5
parent0279799e4f3d2404f657863d04d8c1d6f6c08985 (diff)
parent70039d8c87a0af63e865cdfd91c809c274b590d1 (diff)
downloadotp-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
-rw-r--r--lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl5
-rw-r--r--lib/common_test/test/ct_netconfc_SUITE_data/ns.erl9
-rw-r--r--lib/observer/test/observer_SUITE.erl4
3 files changed, 9 insertions, 9 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),
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 8dea0d8ea8..b6665cb70b 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -66,5 +66,5 @@ app_file(suite) ->
app_file(doc) ->
["Testing .app file"];
app_file(Config) when is_list(Config) ->
- ?line ok = ?t:app_test(os_mon),
+ ?line ok = ?t:app_test(observer),
ok.