diff options
| author | Siri Hansen <[email protected]> | 2013-02-26 15:31:47 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-03-04 11:05:33 +0100 |
| commit | 4469c7d0cb3ba5d3c404ebd13097072d8b531091 (patch) | |
| tree | 8492e0399f310692928b2baa087d20f916870d8f /lib/observer/test/etop_SUITE.erl | |
| parent | f6177aea6270909574e7fc0598d4f16c764491f5 (diff) | |
| download | otp-4469c7d0cb3ba5d3c404ebd13097072d8b531091.tar.gz otp-4469c7d0cb3ba5d3c404ebd13097072d8b531091.tar.bz2 otp-4469c7d0cb3ba5d3c404ebd13097072d8b531091.zip | |
[observer] Kill slave node between tests in etop_SUITE
To avoid that the second test case fails (due to duplicate name) if
the first fails - always kill the slave node after each test case.
Diffstat (limited to 'lib/observer/test/etop_SUITE.erl')
| -rw-r--r-- | lib/observer/test/etop_SUITE.erl | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/lib/observer/test/etop_SUITE.erl b/lib/observer/test/etop_SUITE.erl index 06577f82cc..6ce3ea59cf 100644 --- a/lib/observer/test/etop_SUITE.erl +++ b/lib/observer/test/etop_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2012. All Rights Reserved. +%% Copyright Ericsson AB 2002-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 @@ -21,7 +21,8 @@ %% Test functions -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, - init_per_group/2,end_per_group/2,text/1,text_tracing_off/1]). + init_per_group/2,end_per_group/2]). +-export([text/1,text/2,text_tracing_off/1,text_tracing_off/2]). -export([init_per_testcase/2, end_per_testcase/2]). -include_lib("test_server/include/test_server.hrl"). @@ -31,7 +32,10 @@ init_per_testcase(_Case, Config) -> ?line Dog=test_server:timetrap(?default_timeout), [{watchdog, Dog}|Config]. -end_per_testcase(_Case, Config) -> +end_per_testcase(Case, Config) -> + try apply(?MODULE,Case,[cleanup,Config]) + catch error:undef -> ok + end, Dog=?config(watchdog, Config), ?t:timetrap_cancel(Dog), ok. @@ -82,9 +86,12 @@ text() -> ?line timer:sleep(3000), ?line etop:config(sort,msg_q), ?line timer:sleep(3000), - ?line etop:stop(), - ?line ?t:stop_node(Node), ok. +text(cleanup,_Config) -> + etop:stop(), + {ok,Host} = inet:gethostname(), + Node = list_to_atom("node2@"++Host), + ?t:stop_node(Node). text_tracing_off(suite) -> []; @@ -111,7 +118,10 @@ text_tracing_off(Config) when is_list(Config) -> ?line timer:sleep(3000), ?line etop:config(sort,runtime), % this should not crash, but has no effect ?line timer:sleep(3000), - ?line etop:stop(), - ?line ?t:stop_node(Node), ok. +text_tracing_off(cleanup,_Config) -> + etop:stop(), + {ok,Host} = inet:gethostname(), + Node = list_to_atom("node2@"++Host), + ?t:stop_node(Node). |