diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-09-14 12:20:00 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-09-14 12:20:00 +0100 |
| commit | 5946b4feb0080b4a53b4b1e9bf3b9795a1592012 (patch) | |
| tree | 4ddd8a464ac22610058c549ec82a2a91ac3c63b3 /src | |
| parent | 295fde825147381823631b2f5f59052be4189879 (diff) | |
| parent | a2fd7f5c3d52a97cd7f7f3a78720e7136f5ba6dd (diff) | |
| download | rabbitmq-server-git-5946b4feb0080b4a53b4b1e9bf3b9795a1592012.tar.gz | |
Merged bug25072
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_runtime_parameters.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/rabbit_runtime_parameters.erl b/src/rabbit_runtime_parameters.erl index b932f122fb..b58b459a7f 100644 --- a/src/rabbit_runtime_parameters.erl +++ b/src/rabbit_runtime_parameters.erl @@ -208,7 +208,8 @@ lookup_component(Component) -> end. format(Term) -> - list_to_binary(rabbit_misc:json_encode(rabbit_misc:term_to_json(Term))). + {ok, JSON} = rabbit_misc:json_encode(rabbit_misc:term_to_json(Term)), + list_to_binary(JSON). flatten_errors(L) -> case [{F, A} || I <- lists:flatten([L]), {error, F, A} <- [I]] of diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index e1914ac214..4a6627de5a 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1152,22 +1152,21 @@ test_runtime_parameters() -> Bad = fun(L) -> {error_string, _} = control_action(set_parameter, L) end, %% Acceptable for bijection - Good(["test", "good", "<<\"ignore\">>"]), + Good(["test", "good", "\"ignore\""]), Good(["test", "good", "123"]), Good(["test", "good", "true"]), Good(["test", "good", "false"]), Good(["test", "good", "null"]), - Good(["test", "good", "[{<<\"key\">>, <<\"value\">>}]"]), + Good(["test", "good", "{\"key\": \"value\"}"]), - %% Various forms of fail due to non-bijectability + %% Invalid json Bad(["test", "good", "atom"]), - Bad(["test", "good", "{tuple, foo}"]), - Bad(["test", "good", "[{<<\"key\">>, <<\"value\">>, 1}]"]), - Bad(["test", "good", "[{key, <<\"value\">>}]"]), + Bad(["test", "good", "{\"foo\": \"bar\""]), + Bad(["test", "good", "{foo: \"bar\"}"]), %% Test actual validation hook - Good(["test", "maybe", "<<\"good\">>"]), - Bad(["test", "maybe", "<<\"bad\">>"]), + Good(["test", "maybe", "\"good\""]), + Bad(["test", "maybe", "\"bad\""]), ok = control_action(list_parameters, []), |