aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/test
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-04-05 18:53:52 +0200
committerAnders Svensson <[email protected]>2013-04-06 02:37:48 +0200
commit38304d7b542e3c592d2234391062b4e74c42f4b5 (patch)
tree3409d2ac3a50b2d5784ed04826b09177f4c30bb6 /lib/diameter/test
parentb9ef8bac23fa0421765afe3073f430a1f0d92260 (diff)
downloadotp-38304d7b542e3c592d2234391062b4e74c42f4b5.tar.gz
otp-38304d7b542e3c592d2234391062b4e74c42f4b5.tar.bz2
otp-38304d7b542e3c592d2234391062b4e74c42f4b5.zip
Fix handling of unknown options to diameter:start_service/2
{error, Reason} is now returned, instead of the options being ignored. Note that diameter:add_transport/2 purposely ignores unknown options and that the behaviour is documented. This is historic: some users depend on it in order to store their own options for identifying transport config, instead of using the reference returned by add_transport.
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]],
+ []}]).
%% ===========================================================================