aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/test
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-04-08 12:50:37 +0200
committerAnders Svensson <[email protected]>2013-04-08 12:50:37 +0200
commit157886e6b69e9c7cf1e0e6f8ea932a82b810ea12 (patch)
treebf4890c069b3358fe3d1c62c8bdc1926297beede /lib/diameter/test
parent68380845615d54f23a08d6a5928ef28701de744b (diff)
parent38304d7b542e3c592d2234391062b4e74c42f4b5 (diff)
downloadotp-157886e6b69e9c7cf1e0e6f8ea932a82b810ea12.tar.gz
otp-157886e6b69e9c7cf1e0e6f8ea932a82b810ea12.tar.bz2
otp-157886e6b69e9c7cf1e0e6f8ea932a82b810ea12.zip
Merge branch 'anders/diameter/service_config/OTP-11017' into maint
* anders/diameter/service_config/OTP-11017: Fix handling of unknown options to diameter:start_service/2
Diffstat (limited to 'lib/diameter/test')
-rw-r--r--lib/diameter/test/diameter_config_SUITE.erl15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
index 47def9c8c9..46ff63756d 100644
--- a/lib/diameter/test/diameter_config_SUITE.erl
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -82,7 +82,11 @@
[[true],
[false],
[[node(), node()]]],
- [[x]]}]).
+ [[x]]},
+ {invalid_option, %% invalid service options are rejected
+ [],
+ [[x],
+ [x,x]]}]).
-define(TRANSPORT_CONFIG,
[{transport_module,
@@ -167,7 +171,14 @@
[[{okay, 1}]],
[[{suspect, 2}]]],
[[x],
- [[{open, 0}]]]}]).
+ [[{open, 0}]]]},
+ {private,
+ [[x]],
+ []},
+ {invalid_option, %% invalid transport options are silently ignored
+ [[x],
+ [x,x]],
+ []}]).
%% ===========================================================================