aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/test/diameter_traffic_SUITE.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2017-08-29 15:13:44 +0200
committerAnders Svensson <[email protected]>2017-08-29 15:13:44 +0200
commitc98204a6dacbade814fa32bb1792d05d0657d8db (patch)
tree14cac9b952c4384817a4054a616de3f0c56b93bd /lib/diameter/test/diameter_traffic_SUITE.erl
parent6f9ddb858507dc91cfdf0ccc82f3f6aad5463f50 (diff)
parentce08fb57a66d20fdb3074ca62b7aac0228825e0a (diff)
downloadotp-c98204a6dacbade814fa32bb1792d05d0657d8db.tar.gz
otp-c98204a6dacbade814fa32bb1792d05d0657d8db.tar.bz2
otp-c98204a6dacbade814fa32bb1792d05d0657d8db.zip
Merge branch 'anders/diameter/performance/OTP-14521' into maint
* anders/diameter/performance/OTP-14521: Fix influence of decode_format on service events Work around more common_test woe
Diffstat (limited to 'lib/diameter/test/diameter_traffic_SUITE.erl')
-rw-r--r--lib/diameter/test/diameter_traffic_SUITE.erl13
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 8b0ce9710a..6f30055a0a 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -387,6 +387,16 @@ select(T) ->
%% --------------------
+%% Work around common_test accumulating Config improperly, causing
+%% testcases to get Config from groups and suites they're not in.
+init_per_testcase(N, Config)
+ when N == rfc4005;
+ N == start;
+ N == result_codes;
+ N == empty;
+ N == stop ->
+ Config;
+
%% Skip testcases that can reasonably fail under SCTP.
init_per_testcase(Name, Config) ->
TCs = proplists:get_value(runlist, Config, []),
@@ -409,6 +419,9 @@ end_per_testcase(_, _) ->
ok.
%% replace/2
+%%
+%% Work around common_test running init functions inappropriately, and
+%% this accumulating more config than expected.
replace(Pairs, Config)
when is_list(Pairs) ->