Update the return from init/2 to be {ok, NewState} or {ok,NewState,Priority} instead of NewState.

NewState can still be returned, but is only kept for backward compatability reasons.

3 files changed, 15 insertions, 6 deletions

diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index bbadb657e1..9b288ad168 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -135,10 +135,19 @@ call_id(#ct_hook_config{ module = Mod, opts = Opts} = Hook, Config, Scope) ->
     Id = catch_apply(Mod,id,[Opts], make_ref()),
     {Config, Hook#ct_hook_config{ id = Id, scope = scope(Scope)}}.
 	
-call_init(#ct_hook_config{ module = Mod, opts = Opts, id = Id} = Hook,
+call_init(#ct_hook_config{ module = Mod, opts = Opts, id = Id, prio = P} = Hook,
 	  Config,_Meta) ->
-    NewState = Mod:init(Id, Opts),
-    {Config, Hook#ct_hook_config{ state = NewState } }.
+    case Mod:init(Id, Opts) of
+	{ok, NewState} ->
+	    {Config, Hook#ct_hook_config{ state = NewState } };
+	{ok, NewState, Prio} when P =:= undefined ->
+	    %% Only set prio if not already set when installing hook
+	    {Config, Hook#ct_hook_config{ state = NewState, prio = Prio } };
+	{ok, NewState, _} ->
+	    {Config, Hook#ct_hook_config{ state = NewState } };
+	NewState -> %% Keep for backward compatability reasons
+	    {Config, Hook#ct_hook_config{ state = NewState } }
+    end.    
 
 call_terminate(#ct_hook_config{ module = Mod, state = State} = Hook, _, _) ->
     catch_apply(Mod,terminate,[State], ok),
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
index 71ed61b4c0..7befcfa57c 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -71,11 +71,11 @@
 %% @doc Always called before any other callback function. Use this to initiate

 %% any common state. It should return an state for this CTH.

 -spec init(Id :: term(), Opts :: proplists:proplist()) ->
-    State :: #state{}.

+    {ok, State :: #state{}}.

 init(Id, Opts) ->

     gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),

 					    data = {?MODULE, init, [Id, Opts]}}),

-    Opts.

+    {ok,Opts}.

 

 %% @doc The ID is used to uniquly identify an CTH instance, if two CTH's 

 %% return the same ID the seconds CTH is ignored. This function should NOT 

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
index 35c990c0be..9da48d3a4c 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/state_update_cth.erl
@@ -29,7 +29,7 @@
 

 init(Id, Opts) ->

     State = empty_cth:init(Id, Opts),

-    [init|State].

+    {ok, [init|State]}.

 

 pre_init_per_suite(Suite, Config, State) ->

     empty_cth:pre_init_per_suite(Suite,Config,State),