diff options
| author | Anders Svensson <[email protected]> | 2014-01-27 12:37:03 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-01-27 12:37:03 +0100 |
| commit | 35d2de0a8c04543699e4f317f3f200d9046074e6 (patch) | |
| tree | 61c4e706255ad39f1e8189b204d9dddb7ec36f6a /lib/diameter/test | |
| parent | 930e3e3953b4672e949a6a94d47f8a4035bdd89d (diff) | |
| parent | 2b802628b59b7208b1c936309807f86745a3b6a0 (diff) | |
| download | otp-35d2de0a8c04543699e4f317f3f200d9046074e6.tar.gz otp-35d2de0a8c04543699e4f317f3f200d9046074e6.tar.bz2 otp-35d2de0a8c04543699e4f317f3f200d9046074e6.zip | |
Merge branch 'anders/diameter/undefined_group/OTP-11561'
* anders/diameter/undefined_group/OTP-11561:
Ensure that Grouped AVP's are fully defined in dictionaries
Don't format diameter_make:codec/2 errors
Compiler suite fix
Diffstat (limited to 'lib/diameter/test')
| -rw-r--r-- | lib/diameter/test/diameter_compiler_SUITE.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/diameter/test/diameter_compiler_SUITE.erl b/lib/diameter/test/diameter_compiler_SUITE.erl index ed369e8af3..df4dde6240 100644 --- a/lib/diameter/test/diameter_compiler_SUITE.erl +++ b/lib/diameter/test/diameter_compiler_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. All Rights Reserved. +%% Copyright Ericsson AB 2010-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -138,6 +138,9 @@ {grouped_avp_not_defined, "Failed-AVP *.*", ""}, + {grouped_avp_not_grouped, + "Failed-AVP ::=.*\n.*}", + ""}, {grouped_vendor_id_without_flag, "(Failed-AVP .*)>", "\\1 668>"}, @@ -397,8 +400,8 @@ replace({E, Mods}, Bin) -> case {E, parse(B, [{include, here()}]), Mods} of {ok, {ok, Dict}, _} -> Dict; - {_, {error, S}, _} -> - S + {_, {error, {E,_} = T}, _} when E /= ok -> + diameter_make:format_error(T) end. re({RE, Repl}, Bin) -> |