From 50cf93672b8abb21f1455d41d333481071e6194e Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Tue, 21 Feb 2017 17:03:08 +0100
Subject: [ct] Update built-in ct hooks with new Suite parameter

The Suite parameter is added to all group- and testcase hook
callbacks. This commit updates cth_conn_log and cth_log_redirect
according to this new API.
---
 lib/common_test/src/cth_conn_log.erl     |  8 ++++----
 lib/common_test/src/cth_log_redirect.erl | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'lib/common_test')

diff --git a/lib/common_test/src/cth_conn_log.erl b/lib/common_test/src/cth_conn_log.erl
index 883da0da0a..ce8852b3ea 100644
--- a/lib/common_test/src/cth_conn_log.erl
+++ b/lib/common_test/src/cth_conn_log.erl
@@ -54,8 +54,8 @@
 -include_lib("common_test/include/ct.hrl").
 
 -export([init/2,
-	 pre_init_per_testcase/3,
-	 post_end_per_testcase/4]).
+	 pre_init_per_testcase/4,
+	 post_end_per_testcase/5]).
 
 %%----------------------------------------------------------------------
 %% Exported types
@@ -104,7 +104,7 @@ get_log_opts(Mod,Opts) ->
     Hosts = proplists:get_value(hosts,Opts,[]),
     {LogType,Hosts}.
 
-pre_init_per_testcase(TestCase,Config,CthState) ->
+pre_init_per_testcase(_Suite,TestCase,Config,CthState) ->
     Logs =
 	lists:map(
 	  fun({ConnMod,{LogType,Hosts}}) ->		  
@@ -158,7 +158,7 @@ pre_init_per_testcase(TestCase,Config,CthState) ->
     ct_util:update_testdata(?MODULE, Update, [create]),
     {Config,CthState}.
 
-post_end_per_testcase(TestCase,_Config,Return,CthState) ->
+post_end_per_testcase(_Suite,TestCase,_Config,Return,CthState) ->
     Update =
 	fun(PrevUsers) ->
 		case lists:delete(TestCase, PrevUsers) of
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index 6d77d7ee9e..eda090d4f5 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -28,10 +28,10 @@
 %% CTH Callbacks
 -export([id/1, init/2,
 	 pre_init_per_suite/3, pre_end_per_suite/3, post_end_per_suite/4,
-	 pre_init_per_group/3, post_init_per_group/4,
-	 pre_end_per_group/3, post_end_per_group/4,
-	 pre_init_per_testcase/3, post_init_per_testcase/4,
-	 pre_end_per_testcase/3, post_end_per_testcase/4]).
+	 pre_init_per_group/4, post_init_per_group/5,
+	 pre_end_per_group/4, post_end_per_group/5,
+	 pre_init_per_testcase/4, post_init_per_testcase/5,
+	 pre_end_per_testcase/4, post_end_per_testcase/5]).
 
 %% Event handler Callbacks
 -export([init/1,
@@ -71,11 +71,11 @@ post_end_per_suite(_Suite, Config, Return, State) ->
     set_curr_func(undefined, Config),
     {Return, State}.
 
-pre_init_per_group(Group, Config, State) ->
+pre_init_per_group(_Suite, Group, Config, State) ->
     set_curr_func({group,Group,init_per_group}, Config),
     {Config, State}.
 
-post_init_per_group(Group, Config, Result, tc_log_async) when is_list(Config) ->
+post_init_per_group(_Suite, Group, Config, Result, tc_log_async) when is_list(Config) ->
     case lists:member(parallel,proplists:get_value(
 				 tc_group_properties,Config,[])) of
 	true ->
@@ -83,33 +83,33 @@ post_init_per_group(Group, Config, Result, tc_log_async) when is_list(Config) ->
 	false ->
 	    {Result, tc_log_async}
     end;
-post_init_per_group(_Group, _Config, Result, State) ->
+post_init_per_group(_Suite, _Group, _Config, Result, State) ->
     {Result, State}.
 
-pre_init_per_testcase(TC, Config, State) ->
+pre_init_per_testcase(_Suite, TC, Config, State) ->
     set_curr_func(TC, Config),
     {Config, State}.
 
-post_init_per_testcase(_TC, _Config, Return, State) ->
+post_init_per_testcase(_Suite, _TC, _Config, Return, State) ->
     {Return, State}.
 
-pre_end_per_testcase(_TC, Config, State) ->
+pre_end_per_testcase(_Suite, _TC, Config, State) ->
     {Config, State}.
 
-post_end_per_testcase(_TC, _Config, Result, State) ->
+post_end_per_testcase(_Suite, _TC, _Config, Result, State) ->
     %% Make sure that the event queue is flushed
     %% before ending this test case.
     gen_event:call(error_logger, ?MODULE, flush, 300000),
     {Result, State}.
 
-pre_end_per_group(Group, Config, {tc_log, Group}) ->
+pre_end_per_group(_Suite, Group, Config, {tc_log, Group}) ->
     set_curr_func({group,Group,end_per_group}, Config),
     {Config, set_log_func(tc_log_async)};
-pre_end_per_group(Group, Config, State) ->
+pre_end_per_group(_Suite, Group, Config, State) ->
     set_curr_func({group,Group,end_per_group}, Config),
     {Config, State}.
 
-post_end_per_group(_Group, Config, Return, State) ->
+post_end_per_group(_Suite, _Group, Config, Return, State) ->
     set_curr_func({group,undefined}, Config),
     {Return, State}.
 
-- 
cgit v1.2.3