Remove old test framework

6 files changed, 0 insertions, 1452 deletions

diff --git a/lib/diameter/test/diameter_SUITE.erl b/lib/diameter/test/diameter_SUITE.erl
deleted file mode 100644
index 443cf90e92..0000000000
--- a/lib/diameter/test/diameter_SUITE.erl
+++ /dev/null
@@ -1,108 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Test application config
-%%----------------------------------------------------------------------
-
--module(diameter_SUITE).
-
--export([
-	 suite/0, 
-	 all/0,
-	 groups/0, 
-
-	 init_per_testcase/2,
-	 fin_per_testcase/2,
-
-	 init_per_suite/1, 
-	 end_per_suite/1, 
-
-	 init_per_group/2, 
-	 end_per_group/2, 
-
-	 init/0
-	]).
-
--export([t/0, t/1]).
-
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-init() ->
-    process_flag(trap_exit, true),
-    ?FLUSH().
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Top test case
-
-suite() -> 
-    [{ct_hooks, [{ts_install_cth, [{nodenames,1}]}]}].
-
-all() ->
-    [
-     {group, app},
-     {group, appup},
-     {group, compiler}, 
-     {group, config},
-     {group, sync}, 
-     {group, session},
-     {group, stats},
-     {group, reg},
-     {group, peer}, 
-     {group, tcp}
-    ].
-
-groups() ->
-    [{app,      [], [{diameter_app_test,      all}]},
-     {appup,    [], [{diameter_appup_test,    all}]},
-     {compiler, [], [{diameter_compiler_test, all}]},
-     {config,   [], [{diameter_config_test,   all}]}, 
-     {sync,     [], [{diameter_sync_test,     all}]},
-     {session,  [], [{diameter_session_test,  all}]}, 
-     {stats,    [], [{diameter_stats_test,    all}]}, 
-     {reg,      [], [{diameter_reg_test,      all}]}, 
-     {peer,     [], [{diameter_peer_test,     all}]}, 
-     {tcp,      [], [{diameter_tcp_test,      all}]}].
-
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
diff --git a/lib/diameter/test/diameter_compiler_test.erl b/lib/diameter/test/diameter_compiler_test.erl
deleted file mode 100644
index ae4c9c668d..0000000000
--- a/lib/diameter/test/diameter_compiler_test.erl
+++ /dev/null
@@ -1,104 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the dia compiler of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_compiler_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/diameter_config_test.erl b/lib/diameter/test/diameter_config_test.erl
deleted file mode 100644
index c44fb654ab..0000000000
--- a/lib/diameter/test/diameter_config_test.erl
+++ /dev/null
@@ -1,105 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the config server of the Diameter application
-%%----------------------------------------------------------------------
-%% 
--module(diameter_config_test).
-
--export([
-	 init_per_testcase/2, fin_per_testcase/2, 
-
-	 all/0,
-	 groups/0, 
-	 init_per_suite/1, end_per_suite/1, 
-	 suite_init/1, suite_fin/1, 
-	 init_per_group/2, end_per_group/2
-
-	 %% foo/1
-	]).
-
--export([t/0, t/1]).
-
--include("diameter_test_lib.hrl").
-
-
-t()     -> diameter_test_server:t(?MODULE).
-t(Case) -> diameter_test_server:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    diameter_test_server:init_per_testcase(Case, Config).
-
-fin_per_testcase(Case, Config) ->
-    diameter_test_server:fin_per_testcase(Case, Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() ->
-    [].
-
-groups() ->
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-suite_init(X) -> init_per_suite(X).
-
-init_per_suite(suite) -> [];
-init_per_suite(doc) -> [];
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-suite_fin(X) -> end_per_suite(X).
-
-end_per_suite(suite) -> [];
-end_per_suite(doc) -> [];
-end_per_suite(Config) when is_list(Config) ->
-
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 
-%% Test case example
-%% 
-
-%% foo(suite) ->
-%%     [];
-%% foo(doc) ->
-%%     [];
-%% foo(Config) when is_list(Config) ->
-%%     ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
diff --git a/lib/diameter/test/diameter_test_lib.erl b/lib/diameter/test/diameter_test_lib.erl
deleted file mode 100644
index 3d46236526..0000000000
--- a/lib/diameter/test/diameter_test_lib.erl
+++ /dev/null
@@ -1,478 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-2011. 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
-%% 
-%%----------------------------------------------------------------------
-%% Purpose: Lightweight test server
-%%----------------------------------------------------------------------
-%% 
-
--module(diameter_test_lib).
-
--export([
-	 sleep/1,
-	 
-	 hours/1,
-	 minutes/1,
-	 seconds/1,
-
-	 key1search/2, 
-
-	 non_pc_tc_maybe_skip/4,
-	 os_based_skip/1,
-
-	 fail/3, 
-	 skip/3, 
-	 fatal_skip/3,
-	 
-	 log/4, 
-	 error/3,
-
-	 flush/0,
-
-	 proxy_start/1, proxy_start/2, 
-	 proxy_init/2,
-
-	 still_alive/1, 
-
-	 prepare_test_case/5,
-	 lookup_config/2, 
-
-	 mk_nodes/2, start_nodes/3,
-
-	 display_system_info/1, display_system_info/2, display_system_info/3, 
-	 display_alloc_info/0,
-	 alloc_info/0,
-
-	 report_event/3
-	 
-	]).
-
--include("diameter_test_lib.hrl").
-
--record('REASON', {mod, line, desc}).
-
-
-%% ----------------------------------------------------------------
-%% Time related function
-%%
-
-sleep(infinity) ->
-    receive
-    after infinity ->
-            ok
-    end;
-sleep(MSecs) ->
-    receive
-    after trunc(MSecs) ->
-            ok
-    end,
-    ok.
-
-
-hours(N)   -> trunc(N * 1000 * 60 * 60).
-minutes(N) -> trunc(N * 1000 * 60).
-seconds(N) -> trunc(N * 1000).
-
-
-%% ----------------------------------------------------------------
-
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-	undefined ->
-	    fail({not_found, Key, L}, ?MODULE, ?LINE);
-	{value, {Key, Value}} ->
-	    Value
-    end.
-
-
-%% ----------------------------------------------------------------
-%% Conditional skip of testcases
-%%
-
-non_pc_tc_maybe_skip(Config, Condition, File, Line) 
-  when is_list(Config) andalso is_function(Condition) ->
-    %% Check if we shall skip the skip
-    case os:getenv("TS_OS_BASED_SKIP") of
-	"false" ->
-	    ok;
-	_ ->
-	    case lists:keysearch(ts, 1, Config) of
-		{value, {ts, megaco}} ->
-		    %% Always run the testcase if we are using our own 
-		    %% test-server...
-		    ok;
-		_ ->
-		    case (catch Condition()) of
-			true ->
-			    skip(non_pc_testcase, File, Line);
-			_ ->
-			    ok
-		    end
-	    end
-    end.
-
-
-os_based_skip(any) ->
-    true;
-os_based_skip(Skippable) when is_list(Skippable) ->
-    {OsFam, OsName} = 
-	case os:type() of
-	    {_Fam, _Name} = FamAndName ->
-		FamAndName;
-	    Fam ->
-		{Fam, undefined}
-	end,
-    case lists:member(OsFam, Skippable) of
-	true ->
-	    true;
-	false ->
-	    case lists:keysearch(OsFam, 1, Skippable) of
-		{value, {OsFam, OsName}} ->
-		    true;
-		{value, {OsFam, OsNames}} when is_list(OsNames) ->
-		    lists:member(OsName, OsNames);
-		_ ->
-		    false
-	    end
-    end;
-os_based_skip(_) ->
-    false.
-    
-	    
-%%----------------------------------------------------------------------
-
-error(Actual, Mod, Line) ->
-    global:send(megaco_global_logger, {failed, Mod, Line}),
-    log("<ERROR> Bad result: ~p~n", [Actual], Mod, Line),
-    Label = lists:concat([Mod, "(", Line, ") unexpected result"]),
-    report_event(60, Label, [{line, Mod, Line}, {error, Actual}]),
-    case global:whereis_name(megaco_test_case_sup) of
-	undefined -> 
-	    ignore;
-	Pid -> 
-	    Fail = #'REASON'{mod = Mod, line = Line, desc = Actual},
-	    Pid ! {fail, self(), Fail}
-    end,
-    Actual.
-
-log(Format, Args, Mod, Line) ->
-    case global:whereis_name(megaco_global_logger) of
-	undefined ->
-	    io:format(user, "~p~p(~p): " ++ Format, 
-		      [self(), Mod, Line] ++ Args);
-	Pid ->
-	    io:format(Pid, "~p~p(~p): " ++ Format, 
-		      [self(), Mod, Line] ++ Args)
-    end.
-
-skip(Actual, File, Line) ->
-    log("Skipping test case~n", [], File, Line),
-    String = lists:flatten(io_lib:format("Skipping test case ~p(~p): ~p~n",
-					 [File, Line, Actual])),
-    exit({skipped, String}).
-
-fatal_skip(Actual, File, Line) ->
-    error(Actual, File, Line),
-    exit(shutdown).
-
-
-fail(Actual, File, Line) ->
-    log("Test case failing~n", [], File, Line),
-    String = lists:flatten(io_lib:format("Test case failing ~p (~p): ~p~n",
-					 [File, Line, Actual])),
-    exit({suite_failed, String}).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Flush the message queue and return its messages
-
-flush() ->
-    receive
-	Msg ->
-	    [Msg | flush()]
-    after 1000 ->
-	    []
-    end.
-	    
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The proxy process
-
-proxy_start(ProxyId) ->
-    spawn_link(?MODULE, proxy_init, [ProxyId, self()]).
-
-proxy_start(Node, ProxyId) ->
-    spawn_link(Node, ?MODULE, proxy_init, [ProxyId, self()]).
-
-proxy_init(ProxyId, Controller) ->
-    process_flag(trap_exit, true),
-    ?LOG("[~p] proxy started by ~p~n",[ProxyId, Controller]),
-    proxy_loop(ProxyId, Controller).
-
-proxy_loop(OwnId, Controller) ->
-    receive
-	{'EXIT', Controller, Reason} ->
-	    p("proxy_loop -> received exit from controller"
-	      "~n   Reason: ~p"
-	      "~n", [Reason]),
-	    exit(Reason);
-	{apply, Fun} ->
-	    p("proxy_loop -> received apply request~n", []),
-	    Res = Fun(),
-	    p("proxy_loop -> apply result: "
-	      "~n   ~p"
-	      "~n", [Res]),
-	    Controller ! {res, OwnId, Res},
-	    proxy_loop(OwnId, Controller);
-	OtherMsg ->
-	    p("proxy_loop -> received unknown message: "
-	      "~n  OtherMsg: ~p"
-	      "~n", [OtherMsg]),
-	    Controller ! {msg, OwnId, OtherMsg},
-	    proxy_loop(OwnId, Controller)
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Check if process is alive and kicking
-still_alive(Pid) ->   
-    case catch erlang:is_process_alive(Pid) of % New BIF in Erlang/OTP R5
-	true -> 
-	    true;
-	false -> 
-	    false;
-	{'EXIT', _} -> % Pre R5 backward compatibility 
-	    case process_info(Pid, message_queue_len) of
-		undefined -> false;
-		_ -> true
-	    end 
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-mk_nodes(0, Nodes) ->
-    Nodes;
-mk_nodes(N, []) ->
-    mk_nodes(N - 1, [node()]);
-mk_nodes(N, Nodes) when N > 0 ->
-    Head = hd(Nodes),
-    [Name, Host] = node_to_name_and_host(Head),
-    Nodes ++ [mk_node(I, Name, Host) || I <- lists:seq(1, N)].
-
-mk_node(N, Name, Host) ->
-    list_to_atom(lists:concat([Name ++ integer_to_list(N) ++ "@" ++ Host])).
-    
-%% Returns [Name, Host]    
-node_to_name_and_host(Node) ->
-    string:tokens(atom_to_list(Node), [$@]).
-
-start_nodes([Node | Nodes], File, Line) ->
-    case net_adm:ping(Node) of
-	pong ->
-	    start_nodes(Nodes, File, Line);
-	pang ->
-	    [Name, Host] = node_to_name_and_host(Node),
-	    case slave:start_link(Host, Name) of
-		{ok, NewNode} when NewNode =:= Node ->
-		    Path = code:get_path(),
-		    {ok, Cwd} = file:get_cwd(),
-		    true = rpc:call(Node, code, set_path, [Path]),
-		    ok = rpc:call(Node, file, set_cwd, [Cwd]),
-		    true = rpc:call(Node, code, set_path, [Path]),
-		    {_, []} = rpc:multicall(global, sync, []),
-		    start_nodes(Nodes, File, Line);
-		Other ->
-		    fatal_skip({cannot_start_node, Node, Other}, File, Line)
-	    end
-    end;
-start_nodes([], _File, _Line) ->
-    ok.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-display_alloc_info() ->
-    io:format("Allocator memory information:~n", []),
-    AllocInfo = alloc_info(),
-    display_alloc_info(AllocInfo).
-
-display_alloc_info([]) ->
-    ok;
-display_alloc_info([{Alloc, Mem}|AllocInfo]) ->
-    io:format("  ~15w: ~10w~n", [Alloc, Mem]),
-    display_alloc_info(AllocInfo).
-    
-alloc_info() ->
-    case erlang:system_info(allocator) of
-	{_Allocator, _Version, Features, _Settings} ->
-	    alloc_info(Features);
-	_ ->
-	    []
-    end.
-
-alloc_info(Allocators) ->
-    Allocs = [temp_alloc, sl_alloc, std_alloc, ll_alloc, eheap_alloc, 
-	      ets_alloc, binary_alloc, driver_alloc], 
-    alloc_info(Allocators, Allocs, []).
-
-alloc_info([], _, Acc) ->
-    lists:reverse(Acc);
-alloc_info([Allocator | Allocators], Allocs, Acc) ->
-    case lists:member(Allocator, Allocs) of
-	true ->
-	    Instances0 = erlang:system_info({allocator, Allocator}),
-	    Instances = 
-		if 
-		    is_list(Instances0) ->
-			[Instance || Instance <- Instances0, 
-				     element(1, Instance) =:= instance];
-		    true ->
-			[]
-		end,
-	    AllocatorMem = alloc_mem_info(Instances),
-	    alloc_info(Allocators, Allocs, [{Allocator, AllocatorMem} | Acc]);
-
-	false ->
-	    alloc_info(Allocators, Allocs, Acc)
-    end.
-    
-alloc_mem_info(Instances) ->
-    alloc_mem_info(Instances, []).
-
-alloc_mem_info([], Acc) ->
-    lists:sum([Mem || {instance, _, Mem} <- Acc]);
-alloc_mem_info([{instance, N, Info}|Instances], Acc) ->
-    InstanceMemInfo = alloc_instance_mem_info(Info),
-    alloc_mem_info(Instances, [{instance, N, InstanceMemInfo} | Acc]).
-
-alloc_instance_mem_info(InstanceInfo) ->
-    MBCS = alloc_instance_mem_info(mbcs, InstanceInfo),
-    SBCS = alloc_instance_mem_info(sbcs, InstanceInfo),
-    MBCS + SBCS.
-
-alloc_instance_mem_info(Key, InstanceInfo) ->
-    case lists:keysearch(Key, 1, InstanceInfo) of
-	{value, {Key, Info}} ->
-	    case lists:keysearch(blocks_size, 1, Info) of
-		{value, {blocks_size, Mem, _, _}} ->
-		    Mem;
-		_ ->
-		    0
-	    end;
-	_ ->
-	    0
-    end.
-
-
-display_system_info(WhenStr) ->
-    display_system_info(WhenStr, undefined, undefined).
-
-display_system_info(WhenStr, undefined, undefined) ->
-    display_system_info(WhenStr, "");
-display_system_info(WhenStr, Mod, Func) ->
-    ModFuncStr = lists:flatten(io_lib:format(" ~w:~w", [Mod, Func])),
-    display_system_info(WhenStr, ModFuncStr).
-
-display_system_info(WhenStr, ModFuncStr) ->
-    Fun = fun(F) -> case (catch F()) of
-			{'EXIT', _} ->
-			    undefined;
-			Res ->
-			    Res
-		    end
-	  end,
-    ProcCount    = Fun(fun() -> erlang:system_info(process_count) end),
-    ProcLimit    = Fun(fun() -> erlang:system_info(process_limit) end),
-    ProcMemAlloc = Fun(fun() -> erlang:memory(processes) end),
-    ProcMemUsed  = Fun(fun() -> erlang:memory(processes_used) end),
-    ProcMemBin   = Fun(fun() -> erlang:memory(binary) end),
-    ProcMemTot   = Fun(fun() -> erlang:memory(total) end),
-    %% error_logger:info_msg(
-    io:format("~n"
-	      "~n*********************************************"
-	      "~n"
-	      "System info ~s~s => "
-	      "~n   Process count:        ~w"
-              "~n   Process limit:        ~w"
-              "~n   Process memory alloc: ~w"
-              "~n   Process memory used:  ~w"
-              "~n   Memory for binaries:  ~w"
-              "~n   Memory total:         ~w"
-	      "~n"
-	      "~n*********************************************"
-	      "~n"
-	      "~n", [WhenStr, ModFuncStr, 
-		     ProcCount, ProcLimit, ProcMemAlloc, ProcMemUsed, 
-		     ProcMemBin, ProcMemTot]),
-    ok.
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-prepare_test_case(Actions, N, Config, File, Line) ->
-    OrigNodes = lookup_config(nodes, Config),
-    TestNodes = lookup_config(nodenames, Config), %% For testserver
-    This = node(),
-    SomeNodes = OrigNodes ++ (TestNodes -- OrigNodes),
-    AllNodes = [This | (SomeNodes -- [This])],
-    Nodes = pick_n_nodes(N, AllNodes, File, Line),
-    start_nodes(Nodes, File, Line),
-    do_prepare_test_case(Actions, Nodes, Config, File, Line).
-
-do_prepare_test_case([init | Actions], Nodes, Config, File, Line) ->
-    process_flag(trap_exit, true),
-    megaco_test_lib:flush(),
-    do_prepare_test_case(Actions, Nodes, Config, File, Line);
-do_prepare_test_case([{stop_app, App} | Actions], Nodes, Config, File, Line) ->
-    _Res = rpc:multicall(Nodes, application, stop, [App]),
-    do_prepare_test_case(Actions, Nodes, Config, File, Line);
-do_prepare_test_case([], Nodes, _Config, _File, _Line) ->
-    Nodes.
-
-pick_n_nodes(all, AllNodes, _File, _Line) ->
-    AllNodes;
-pick_n_nodes(N, AllNodes, _File, _Line)
-  when is_integer(N) andalso (length(AllNodes) >= N) ->
-    AllNodes -- lists:nthtail(N, AllNodes);
-pick_n_nodes(N, AllNodes, File, Line) ->
-    fatal_skip({too_few_nodes, N, AllNodes}, File, Line).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-lookup_config(Key, Config) ->
-    case lists:keysearch(Key, 1, Config) of
-	{value, {Key, Val}} ->
-	    Val;
-	_ ->
-	    []
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-report_event(_Severity, _Label, _Content) ->
-    %% diameter:report_event(Severity, Label, Content).
-    hopefully_traced.
-
-
-p(F,A) ->
-    io:format("~p" ++ F ++ "~n", [self()|A]).
diff --git a/lib/diameter/test/diameter_test_lib.hrl b/lib/diameter/test/diameter_test_lib.hrl
deleted file mode 100644
index 0b86f38de7..0000000000
--- a/lib/diameter/test/diameter_test_lib.hrl
+++ /dev/null
@@ -1,106 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Define common macros for testing
-%%----------------------------------------------------------------------
-%% 
-
--define(FLUSH(),        diameter_test_lib:flush()).
-
--define(SLEEP(MSEC),    diameter_test_lib:sleep(MSEC)).
--define(M(),            diameter_test_lib:millis()).
--define(MDIFF(A,B),     diameter_test_lib:millis_diff(A,B)).
-
--define(HOURS(T),       diameter_test_lib:hours(T)).
--define(MINUTES(T),     diameter_test_lib:minutes(T)).
--define(SECONDS(T),     diameter_test_lib:seconds(T)).
-
--define(KEY1SEARCH(Key, L), diameter_test_lib:key1search(Key, L)).
-
-
--define(APPLY(Proxy, Fun),
-	Proxy ! {apply, Fun}).
-
--define(LOG(Format, Args),
-	diameter_test_lib:log(Format, Args, ?MODULE, ?LINE)).
-
--define(ERROR(Reason),
-	diameter_test_lib:error(Reason, ?MODULE, ?LINE)).
-
--define(OS_BASED_SKIP(Skippable),
-	diameter_test_lib:os_based_skip(Skippable)).
-
--define(NON_PC_TC_MAYBE_SKIP(Config, Condition),
-	diameter_test_lib:non_pc_tc_maybe_skip(Config, Condition, ?MODULE, ?LINE)).
-
--define(FAIL(Reason),
-	diameter_test_lib:fail(Reason, ?MODULE, ?LINE)).
-
--define(SKIP(Reason),
-	diameter_test_lib:skip(Reason, ?MODULE, ?LINE)).
-
--define(VERIFYL(Expected, Expr),
-	fun(A,B) when list(A), list(B) ->
-		A1 = lists:sort(A),
-		B1 = lists:sort(B),
-		case A1 of
-		    B1 -> ?LOG("Ok, ~p~n", [B]);
-		    _  -> ?ERROR(B)
-		end,
-		B;
-	   (A,A) ->
-		?LOG("Ok, ~p~n", [A]),
-		A;
-	   (A,B) ->
-		?ERROR(B),
-		B
-	end(Expected, (catch Expr))).
-
--define(VERIFY(Expected, Expr),
-	fun() ->
-		AcTuAlReS = (catch (Expr)),
-		case AcTuAlReS of
-		    Expected -> ?LOG("Ok, ~p~n", [AcTuAlReS]);
-		    _        ->	?ERROR(AcTuAlReS)
-		end,
-		AcTuAlReS
-	end()).
-
--define(RECEIVE(Expected),
-	?VERIFY(Expected, ?FLUSH())).
-
--define(MULTI_RECEIVE(Expected),
-	?VERIFY(lists:sort(Expected), lists:sort(?FLUSH()))).
-
--define(ACQUIRE_NODES(N, Config),
-	diameter_test_lib:prepare_test_case([init, {stop_app, diameter}],
-					    N, Config, ?FILE, ?LINE)).
-
-
--define(REPORT_IMPORTANT(Label, Content), ?REPORT_EVENT(20, Label, Content)).
--define(REPORT_VERBOSE(Label, Content),   ?REPORT_EVENT(40, Label, Content)).
--define(REPORT_DEBUG(Label, Content),     ?REPORT_EVENT(60, Label, Content)).
--define(REPORT_TRACE(Label, Content),     ?REPORT_EVENT(80, Label, Content)).
-
--define(REPORT_EVENT(Severity, Label, Content),
-	diameter_test_lib:report_event(Severity, Label, 
-				       [{line, ?MODULE, ?LINE} | Content])).
-
diff --git a/lib/diameter/test/diameter_test_server.erl b/lib/diameter/test/diameter_test_server.erl
deleted file mode 100644
index e2ff73fb8e..0000000000
--- a/lib/diameter/test/diameter_test_server.erl
+++ /dev/null
@@ -1,551 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2010-2011. 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% %CopyrightEnd%
-%%
-
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Lightweight test server
-%%----------------------------------------------------------------------
-
--module(diameter_test_server).
-
--export([
-	 t/1, t/2,
-
-	 init_per_testcase/2, 
-	 fin_per_testcase/2
-	]).
-
--include("diameter_test_lib.hrl").
-
-
--define(GLOGGER, diameter_global_logger).
-
-
-%% ----------------------------------------------------------------
-%%
-
-t([Case]) when is_atom(Case) ->
-    t(Case);
-t(Case) ->
-    process_flag(trap_exit, true),
-    MEM = fun() -> case (catch erlang:memory()) of
-			{'EXIT', _} ->
-			    [];
-			Res ->
-			    Res
-		    end
-	  end,
-    Alloc1 = diameter_test_lib:alloc_info(),
-    Mem1   = MEM(),
-    Res    = lists:flatten(t(Case, default_config())),
-    Alloc2 = diameter_test_lib:alloc_info(),
-    Mem2   = MEM(),
-    %% io:format("Res: ~p~n", [Res]),
-    display_result(Res, Alloc1, Mem1, Alloc2, Mem2),
-    Res.
-
-
-groups(Mod) when is_atom(Mod) ->
-    try Mod:groups() of
-        Groups when is_list(Groups) ->
-            Groups;
-        BadGroups ->
-            exit({bad_groups, Mod, BadGroups})
-    catch
-        _:_ ->
-            []
-    end.
-
-init_suite(Mod, Config) ->
-    io:format("~w:init_suite -> entry with"
-	      "~n   Mod:    ~p"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Mod, Config]),
-    Mod:init_per_suite(Config).
-
-end_suite(Mod, Config) ->
-    Mod:end_per_suite(Config).
-
-init_group(Mod, Group, Config) ->
-    Mod:init_per_group(Group, Config).
-
-end_group(Mod, Group, Config) ->
-    Mod:init_per_group(Group, Config).
-
-%% This is for sub-SUITEs
-t({_Mod, {NewMod, all}, _Groups}, _Config) when is_atom(NewMod) ->
-    io:format("~w:t(all) -> entry with"
-	      "~n   NewMod: ~p"
-	      "~n", [?MODULE, NewMod]),
-    t(NewMod);
-t({Mod, {group, Name} = Group, Groups}, Config)
-  when is_atom(Mod) andalso is_atom(Name) andalso is_list(Groups) ->
-    io:format("~w:t(group) -> entry with"
-	      "~n   Mod:    ~p"
-	      "~n   Name:   ~p"
-	      "~n   Groups: ~p"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Mod, Name, Groups, Config]),
-    case lists:keysearch(Name, 1, Groups) of
-        {value, {Name, _Props, GroupsAndCases}} ->
-            try init_group(Mod, Name, Config) of
-                Config2 when is_list(Config2) ->
-                    Res = [t({Mod, Case, Groups}, Config2) ||
-                              Case <- GroupsAndCases],
-                    (catch end_group(Mod, Name, Config2)),
-                    Res;
-                Error ->
-                    io:format(" => group (~w) init failed: ~p~n",
-                              [Name, Error]),
-                    [{failed, {Mod, Group}, Error}]
-            catch
-                exit:{skipped, SkipReason} ->
-                    io:format(" => skipping group: ~p~n", [SkipReason]),
-                    [{skipped, {Mod, Group}, SkipReason, 0}];
-                exit:{undef, _} ->
-                    [t({Mod, Case, Groups}, Config) ||
-			Case <- GroupsAndCases];
-                T:E ->
-                    [{failed, {Mod, Group}, {T,E}, 0}]
-            end;
-        false ->
-            exit({unknown_group, Mod, Name, Groups})
-    end;
-t({Mod, Fun, _}, Config)
-  when is_atom(Mod) andalso is_atom(Fun) ->
-    io:format("~w:t -> entry with"
-	      "~n   Mod:    ~p"
-	      "~n   Fun:    ~p"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Mod, Fun, Config]),
-    case catch apply(Mod, Fun, [suite]) of
-        [] ->
-            io:format("Eval:   ~p:", [{Mod, Fun}]),
-            Res = eval(Mod, Fun, Config),
-            {R, _, _, _} = Res,
-            io:format(" ~p~n", [R]),
-            Res;
-
-        Cases when is_list(Cases) ->
-            io:format("Expand: ~p ...~n", [{Mod, Fun}]),
-            Map = fun(Case) when is_atom(Case) -> {Mod, Case};
-                     (Case) -> Case
-                  end,
-            t(lists:map(Map, Cases), Config);
-
-        {'EXIT', {undef, _}} ->
-            io:format("Undefined:   ~p~n", [{Mod, Fun}]),
-            [{nyi, {Mod, Fun}, ok, 0}];
-
-        Error ->
-            io:format("Ignoring:   ~p: ~p~n", [{Mod, Fun}, Error]),
-            [{failed, {Mod, Fun}, Error, 0}]
-    end;
-t(Mod, Config) when is_atom(Mod) ->
-    io:format("~w:t -> entry with"
-	      "~n   Mod:    ~p"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Mod, Config]),
-    %% This is assumed to be a test suite, so we start by calling
-    %% the top test suite function(s) (all/0 and groups/0).
-    case (catch Mod:all()) of
-        Cases when is_list(Cases) ->
-            %% The list may contain atoms (actual test cases) and
-            %% group-tuples (a tuple naming a group of test cases).
-            %% A group is defined by the (optional) groups/0 function.
-	    io:format("~w:t -> suite all ok"
-		      "~n   Cases: ~p"
-		      "~n", [?MODULE, Cases]),
-            Groups = groups(Mod),
-	    io:format("~w:t -> "
-		      "~n   Groups: ~p"
-		      "~n", [?MODULE, Groups]),
-            try init_suite(Mod, Config) of
-                Config2 when is_list(Config2) ->
-		    io:format("~w:t -> suite init ok"
-			      "~n   Config2: ~p"
-			      "~n", [?MODULE, Config2]),
-                    Res = [t({Mod, Case, Groups}, Config2) || Case <- Cases],
-                    (catch end_suite(Mod, Config2)),
-                    Res;
-                Error ->
-                    io:format(" => suite init failed: ~p~n", [Error]),
-                    [{failed, {Mod, init_per_suite}, Error}]
-            catch
-                exit:{skipped, SkipReason} ->
-                    io:format(" => skipping suite: ~p~n", [SkipReason]),
-                    [{skipped, {Mod, init_per_suite}, SkipReason, 0}];
-                exit:{undef, _} ->
-                    io:format("~w:t -> suite init failed. exit undef(1)~n", [?MODULE]),
-                    [t({Mod, Case, Groups}, Config) || Case <- Cases];
-                exit:undef ->
-                    io:format("~w:t -> suite init failed. exit undef(2)~n", [?MODULE]),
-                    [t({Mod, Case, Groups}, Config) || Case <- Cases];
-                T:E ->
-                    io:format("~w:t -> suite init failed. "
-			      "~n   T: ~p"
-			      "~n   E: ~p"
-			      "~n", [?MODULE, T,E]),
-                    [{failed, {Mod, init_per_suite}, {T,E}, 0}]
-            end;
-        {'EXIT', {undef, _}} ->
-            io:format("Undefined:   ~p~n", [{Mod, all}]),
-            [{nyi, {Mod, all}, ok, 0}];
-
-        Crap ->
-	    io:format("~w:t -> suite all failed: "
-		      "~n   Crap: ~p"
-		      "~n", [?MODULE, Crap]),
-            Crap
-    end;
-t(Bad, _Config) ->
-    io:format("~w:t -> entry with"
-	      "~n   Bad: ~p"
-	      "~n", [?MODULE, Bad]),
-    [{badarg, Bad, ok, 0}].
-
-eval(Mod, Fun, Config) ->
-    TestCase = {?MODULE, Mod, Fun},
-    Label = lists:concat(["TEST CASE: ", Fun]),
-    ?REPORT_VERBOSE(Label ++ " started", [TestCase, Config]),
-    global:register_name(diameter_test_case_sup, self()),
-    Flag = process_flag(trap_exit, true),
-    put(diameter_test_server, true),
-    Config2 = Mod:init_per_testcase(Fun, Config),
-    Self = self(), 
-    Pid = spawn_link(fun() -> do_eval(Self, Mod, Fun, Config2) end),
-    R = wait_for_evaluator(Pid, Mod, Fun, Config2, []),
-    Mod:fin_per_testcase(Fun, Config2),
-    erase(diameter_test_server),    
-    global:unregister_name(diameter_test_case_sup),
-    process_flag(trap_exit, Flag),
-    R.
-
-wait_for_evaluator(Pid, Mod, Fun, Config, Errors) ->
-    wait_for_evaluator(Pid, Mod, Fun, Config, Errors, 0).
-wait_for_evaluator(Pid, Mod, Fun, Config, Errors, AccTime) ->
-    TestCase = {?MODULE, Mod, Fun},
-    Label = lists:concat(["TEST CASE: ", Fun]),
-    receive
-	{done, Pid, ok, Time} when Errors =:= [] ->
-	    ?REPORT_VERBOSE(Label ++ " ok", 
-			    [{test_case, TestCase}, {config, Config}]),
-	    {ok, {Mod, Fun}, Errors, Time};
-	{done, Pid, ok, Time} ->
-	    ?REPORT_VERBOSE(Label ++ " failed", 
-			    [{test_case, TestCase}, {config, Config}]),
-	    {failed, {Mod, Fun}, Errors, Time};
-	{done, Pid, {ok, _}, Time} when Errors =:= [] ->
-	    ?REPORT_VERBOSE(Label ++ " ok",
-			    [{test_case, TestCase}, {config, Config}]),
-	    {ok, {Mod, Fun}, Errors, Time};
-	{done, Pid, {ok, _}, Time} ->
-	    ?REPORT_VERBOSE(Label ++ " failed",
-			    [{test_case, TestCase}, {config, Config}]),
-	    {failed, {Mod, Fun}, Errors, Time};
-	{done, Pid, Fail, Time} ->
-	    ?REPORT_IMPORTANT(Label ++ " failed",
-			      [{test_case, TestCase}, 
-			       {config,    Config}, 
-			       {return,    Fail}, 
-			       {errors,    Errors}]),
-	    {failed, {Mod, Fun}, Fail, Time};
-	{'EXIT', Pid, {skipped, Reason}, Time} -> 
-	    ?REPORT_IMPORTANT(Label ++ " skipped",
-			      [{test_case, TestCase}, 
-			       {config,    Config}, 
-			       {skipped,   Reason}]),
-	    {skipped, {Mod, Fun}, Errors, Time};
-	{'EXIT', Pid, Reason, Time} -> 
-	    ?REPORT_IMPORTANT(Label ++ " crashed",
-			      [{test_case, TestCase}, 
-			       {config,    Config}, 
-			       {'EXIT',    Reason}]),
-	    {crashed, {Mod, Fun}, [{'EXIT', Reason} | Errors], Time};
-	{fail, Pid, Reason, Time} ->
-	    wait_for_evaluator(Pid, Mod, Fun, Config, 
-			       Errors ++ [Reason], AccTime + Time)
-    end.
-
-do_eval(ReplyTo, Mod, Fun, Config) ->
-    diameter_test_lib:display_system_info("before", Mod, Fun),
-    case timer:tc(Mod, Fun, [Config]) of
-	{Time, {'EXIT', {skipped, Reason}}} ->
-	    display_tc_time(Time),
-	    diameter_test_lib:display_system_info("after (skipped)", Mod, Fun),
-	    ReplyTo ! {'EXIT', self(), {skipped, Reason}, Time};
-	{Time, {'EXIT', Reason}} ->
-	    display_tc_time(Time),
-	    diameter_test_lib:display_system_info("after (crashed)", Mod, Fun),
-	    ReplyTo ! {'EXIT', self(), Reason, Time};
-	{Time, Other} ->
-	    display_tc_time(Time),
-	    diameter_test_lib:display_system_info("after", Mod, Fun),
-	    ReplyTo ! {done, self(), Other, Time}
-    end,
-    unlink(ReplyTo),
-    exit(shutdown).
-
-
-display_tc_time(Time) ->
-    io:format("~n"
-	      "~n*********************************************"
-	      "~n"
-	      "~nTest case completion time: ~.3f sec (~w)"
-	      "~n", [(Time / 1000000), Time]),
-    ok.
-
-
-display_result(Res, Alloc1, Mem1, Alloc2, Mem2) ->
-    io:format("~nAllocator info: ~n", []),
-    display_alloc(Alloc1, Alloc2),
-    io:format("~nMemory info: ~n", []),
-    display_memory(Mem1, Mem2),
-    display_result(Res).
-
-display_alloc([], []) ->
-    io:format("-~n", []),
-    ok;
-display_alloc(A1, A2) ->
-    do_display_alloc(A1, A2).
-
-do_display_alloc([], _) ->
-    ok;
-do_display_alloc([{Alloc, Mem1}|AllocInfo1], AllocInfo2) ->
-    Mem2 = 
-	case lists:keysearch(Alloc, 1, AllocInfo2) of
-	    {value, {_, Val}} ->
-		Val;
-	    false ->
-		undefined
-	end,
-    io:format("~15w: ~10w -> ~w~n", [Alloc, Mem1, Mem2]),
-    do_display_alloc(AllocInfo1, AllocInfo2).
-
-display_memory([], []) ->
-    io:format("-~n", []),
-    ok;
-display_memory(Mem1, Mem2) ->
-    do_display_memory(Mem1, Mem2).
-
-
-do_display_memory([], _) ->
-    ok;
-do_display_memory([{Key, Mem1}|MemInfo1], MemInfo2) ->
-    Mem2 = 
-	case lists:keysearch(Key, 1, MemInfo2) of
-	    {value, {_, Val}} ->
-		Val;
-	    false ->
-		undefined
-	end,
-    io:format("~15w: ~10w -> ~w~n", [Key, Mem1, Mem2]),
-    do_display_memory(MemInfo1, MemInfo2).
-
-display_result([]) ->    
-    io:format("OK~n", []);
-display_result(Res) when is_list(Res) ->
-    Ok      = [{MF, Time} || {ok,  MF, _, Time}  <- Res],
-    Nyi     = [MF || {nyi, MF, _, _Time} <- Res],
-    Skipped = [{MF, Reason} || {skipped, MF, Reason, _Time} <- Res],
-    Failed  = [{MF, Reason} || {failed,  MF, Reason, _Time} <- Res],
-    Crashed = [{MF, Reason} || {crashed, MF, Reason, _Time} <- Res],
-    display_summery(Ok, Nyi, Skipped, Failed, Crashed),
-    display_ok(Ok),
-    display_skipped(Skipped),
-    display_failed(Failed),
-    display_crashed(Crashed).
-
-display_summery(Ok, Nyi, Skipped, Failed, Crashed) ->
-    io:format("~nTest case summery:~n", []),
-    display_summery(Ok,      "successfull"),
-    display_summery(Nyi,     "not yet implemented"),
-    display_summery(Skipped, "skipped"),
-    display_summery(Failed,  "failed"),
-    display_summery(Crashed, "crashed"),
-    io:format("~n", []).
-   
-display_summery(Res, Info) ->
-    io:format("  ~w test cases ~s~n", [length(Res), Info]).
-    
-display_ok([]) ->
-    ok;
-display_ok(Ok) ->
-    io:format("Ok test cases:~n", []),
-    F = fun({{M, F}, Time}) -> 
-		io:format("  ~w : ~w => ~.2f sec~n", [M, F, Time / 1000000]) 
-	end,
-    lists:foreach(F, Ok),
-    io:format("~n", []).
-
-display_skipped([]) ->
-    ok;
-display_skipped(Skipped) ->
-    io:format("Skipped test cases:~n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p~n", [MF, Reason]) end,
-    lists:foreach(F, Skipped),
-    io:format("~n", []).
-
-
-display_failed([]) ->
-    ok;
-display_failed(Failed) ->
-    io:format("Failed test cases:~n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p~n", [MF, Reason]) end,
-    lists:foreach(F, Failed),
-    io:format("~n", []).
-
-display_crashed([]) ->
-    ok;
-display_crashed(Crashed) ->
-    io:format("Crashed test cases:~n", []),
-    F = fun({MF, Reason}) -> io:format("  ~p => ~p~n", [MF, Reason]) end,
-    lists:foreach(F, Crashed),
-    io:format("~n", []).
-        
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Test server callbacks
-init_per_testcase(_Case, Config) ->
-    Pid = group_leader(),
-    Name = ?GLOGGER, 
-    case global:whereis_name(Name) of
-	undefined ->
-	    global:register_name(?GLOGGER, Pid);
-	Pid ->
-	    io:format("~w:init_per_testcase -> "
-		      "already registered to ~p~n", [?MODULE, Pid]),
-	    ok;
-	OtherPid when is_pid(OtherPid) ->
-	    io:format("~w:init_per_testcase -> "
-		      "already registered to other ~p (~p)~n", 
-		      [?MODULE, OtherPid, Pid]),
-	    exit({already_registered, {?GLOGGER, OtherPid, Pid}})
-    end,
-    set_kill_timer(Config).
-
-fin_per_testcase(_Case, Config) ->
-    Name = ?GLOGGER, 
-    case global:whereis_name(Name) of
-	undefined ->
-	    io:format("~w:fin_per_testcase -> already un-registered~n", 
-		      [?MODULE]),
-	    ok;
-	Pid when is_pid(Pid) ->
-	    global:unregister_name(?GLOGGER),
-	    ok
-    end,
-    reset_kill_timer(Config).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Set kill timer
-
-set_kill_timer(Config) ->
-    case init:get_argument(diameter_test_timeout) of
-	{ok, _} -> 
-	    Config;
-	_ ->
-	    Time = 
-		case lookup_config(tc_timeout, Config) of
-		    [] ->
-			timer:minutes(5);
-		    ConfigTime when is_integer(ConfigTime) ->
-			ConfigTime
-		end,
-	    Dog = 
-		case get(diameter_test_server) of
-		    true ->
-			Self = self(), 
-			spawn_link(fun() -> watchdog(Self, Time) end);
-		    _ ->
-			test_server:timetrap(Time)
-		end,
-	    [{kill_timer, Dog}|Config]
-		    
-	    
-    end.
-
-reset_kill_timer(Config) ->
-    DogKiller = 
-	case get(diameter_test_server) of
-	    true ->
-		fun(P) when is_pid(P) -> P ! stop;
-		   (_) -> ok 
-		end;
-	    _ ->
-		fun(Ref) -> test_server:timetrap_cancel(Ref) end
-	end,
-    case lists:keysearch(kill_timer, 1, Config) of
-	{value, {kill_timer, Dog}} ->
-	    DogKiller(Dog), 
-	    lists:keydelete(kill_timer, 1, Config);
-	_ ->
-	    Config
-    end.
-
-watchdog(Pid, Time) ->
-    erlang:now(),
-    receive
-	stop ->
-	    ok
-    after Time ->
-	    case (catch process_info(Pid)) of
-		undefined ->
-		    ok;
-		Info ->
-		    ?LOG("<ERROR> Watchdog in test case timed out "
-			"for ~p after ~p min"
-			 "~n~p"
-			 "~n",
-		    [Pid, Time div (1000*60), Info]),
-		    exit(Pid, kill)
-	    end
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-lookup_config(Key, Config) ->
-    diameter_test_lib:lookup_config(Key, Config).
-
-default_config() ->
-    [{nodes, default_nodes()}, {ts, diameter}].
-
-default_nodes() ->    
-    mk_nodes(2, []).
-
-mk_nodes(0, Nodes) ->
-    Nodes;
-mk_nodes(N, []) ->
-    mk_nodes(N - 1, [node()]);
-mk_nodes(N, Nodes) when N > 0 ->
-    Head = hd(Nodes),
-    [Name, Host] = node_to_name_and_host(Head),
-    Nodes ++ [mk_node(I, Name, Host) || I <- lists:seq(1, N)].
-
-mk_node(N, Name, Host) ->
-    list_to_atom(lists:concat([Name ++ integer_to_list(N) ++ "@" ++ Host])).
-    
-%% Returns [Name, Host]    
-node_to_name_and_host(Node) ->
-    string:tokens(atom_to_list(Node), [$@]).
-
-
-
-