diff options
| author | Anders Svensson <[email protected]> | 2011-12-07 16:52:11 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-12-07 16:52:11 +0100 |
| commit | ac3cbe8bee6b826004c02a1d21f8093899716b33 (patch) | |
| tree | 0550844be1423b06c75c704af6bab056ffe69750 /lib/diameter/test/diameter_transport_SUITE.erl | |
| parent | 6004f23e77856b8182fae699789b994e55691138 (diff) | |
| parent | 75fa191f9fc48a769e5f99f8dc6b9463d21c9e0c (diff) | |
| download | otp-ac3cbe8bee6b826004c02a1d21f8093899716b33.tar.gz otp-ac3cbe8bee6b826004c02a1d21f8093899716b33.tar.bz2 otp-ac3cbe8bee6b826004c02a1d21f8093899716b33.zip | |
Merge branch 'anders/diameter/suites_and_dialyzer/OTP-9781'
* anders/diameter/suites_and_dialyzer/OTP-9781:
Minor diameter_dict_scanner fix
Skip sctp tests on {error, esocktnosupport}
Ensure that TLS will be available in TLS suite
Diffstat (limited to 'lib/diameter/test/diameter_transport_SUITE.erl')
| -rw-r--r-- | lib/diameter/test/diameter_transport_SUITE.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl index 3bd96ee422..df7161fd1e 100644 --- a/lib/diameter/test/diameter_transport_SUITE.erl +++ b/lib/diameter/test/diameter_transport_SUITE.erl @@ -179,7 +179,8 @@ have_sctp() -> {ok, Sock} -> gen_sctp:close(Sock), true; - {error, eprotonosupport} -> %% fail on any other reason + {error, E} when E == eprotonosupport; + E == esocktnosupport -> %% fail on any other reason false catch error: badarg -> |