From cccddb719e592b3c4b6578015fa2682fd69f9535 Mon Sep 17 00:00:00 2001 From: Jakub Witczak Date: Wed, 4 Dec 2024 11:04:09 +0100 Subject: [PATCH] common_test: cth_surefire don't fail on group skip - avoid calling erlang:tl with an empty list --- lib/common_test/src/cth_surefire.erl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl index bad859499e4e..c09744efbd2c 100644 --- a/lib/common_test/src/cth_surefire.erl +++ b/lib/common_test/src/cth_surefire.erl @@ -265,10 +265,11 @@ on_tc_skip(Suite,Tc, Res, State0) -> State0 end, State2 = end_tc(Tc,[],Res,init_tc(set_suite(Suite,State1),[])), + CurrGroup = State2#state.curr_group, State = - case Tc of - end_per_group -> - State2#state{curr_group = tl(State2#state.curr_group)}; + case {Tc, is_list(CurrGroup) andalso length(CurrGroup)>0}of + {end_per_group, true} -> + State2#state{curr_group = tl(CurrGroup)}; _ -> State2 end,