diff options
| author | Anders Svensson <[email protected]> | 2016-09-12 22:31:33 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2016-09-12 22:31:33 +0200 |
| commit | 58cc6bb63216d66975b8b9a895c0596925a8571d (patch) | |
| tree | 469e10081c0cc0c85a63ad67d4ce1cf8c50be900 /lib/diameter/test | |
| parent | 5620f7b8e8444bbaf5ad7ba17b842aae2a8f5d9d (diff) | |
| parent | 3863fc2feecff6f9945082d0b08ff8e423a8da4c (diff) | |
| download | otp-58cc6bb63216d66975b8b9a895c0596925a8571d.tar.gz otp-58cc6bb63216d66975b8b9a895c0596925a8571d.tar.bz2 otp-58cc6bb63216d66975b8b9a895c0596925a8571d.zip | |
Merge branch 'anders/diameter/19.1/OTP-13838' into maint
* anders/diameter/19.1/OTP-13838:
vsn -> 1.12.1
Update appup for 19.1
Fix xmllint errors in documentation
Remove documentation overkill
Don't run traffic tests in parallel when {string_decode, true}
Remove copyright from generated dictionary modules
Fix dictionary function typo
Fix dictionary typo in relay example
Diffstat (limited to 'lib/diameter/test')
| -rw-r--r-- | lib/diameter/test/diameter_traffic_SUITE.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl index 6f3a4801ee..4c82d4dee2 100644 --- a/lib/diameter/test/diameter_traffic_SUITE.erl +++ b/lib/diameter/test/diameter_traffic_SUITE.erl @@ -248,17 +248,14 @@ all() -> groups() -> Ts = tc(), Sctp = ?util:have_sctp(), - [{?util:name([R,D,A,C]), [parallel], Ts} || R <- ?ENCODINGS, - D <- ?RFCS, - A <- ?ENCODINGS, - C <- ?CONTAINERS] + [{B, [P], Ts} || {B,P} <- [{true, shuffle}, {false, parallel}]] ++ [{?util:name([T,R,D,A,C,SD,CD]), [], [start_services, add_transports, result_codes, - {group, ?util:name([R,D,A,C])}, + {group, SD orelse CD}, remove_transports, stop_services]} || T <- ?TRANSPORTS, |