From 6759b2b5f0603c080277d2b019789d1693ff5e57 Mon Sep 17 00:00:00 2001 From: Anders Svensson Date: Wed, 5 Apr 2017 16:34:55 +0200 Subject: Make traffic suite fail less brutally Autoskip traffic testcases if transport isn't established instead of having traffic cases run and fail. --- lib/diameter/test/diameter_traffic_SUITE.erl | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'lib/diameter/test/diameter_traffic_SUITE.erl') diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl index 105c0ffefa..e1d3d186a3 100644 --- a/lib/diameter/test/diameter_traffic_SUITE.erl +++ b/lib/diameter/test/diameter_traffic_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2016. All Rights Reserved. +%% Copyright Ericsson AB 2010-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -252,11 +252,7 @@ groups() -> ++ [{?util:name([T,R,D,A,C,SD,CD]), [], - [start_services, - add_transports, - {group, SD orelse CD}, - remove_transports, - stop_services]} + [{group, SD orelse CD}]} || T <- ?TRANSPORTS, T /= sctp orelse Sctp, R <- ?ENCODINGS, @@ -276,6 +272,11 @@ groups() -> SD <- ?STRING_DECODES, CD <- ?STRING_DECODES]}]. +init_per_group(B, Config) + when is_boolean(B) -> + start_services(Config), + add_transports(Config); + init_per_group(Name, Config) -> case ?util:name(Name) of [T,R,D,A,C,SD,CD] -> @@ -293,6 +294,11 @@ init_per_group(Name, Config) -> Config end. +end_per_group(B, Config) + when is_boolean(B) -> + remove_transports(Config), + stop_services(Config); + end_per_group(_, _) -> ok. -- cgit v1.2.3