diff options
| author | Peter Andersson <[email protected]> | 2015-03-18 10:54:04 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-03-18 10:54:04 +0100 |
| commit | 09d3fe862a7aea715029b88237f0390296eb294a (patch) | |
| tree | 2b25e5b295be1032f11f413171e13441e7423a8d /lib/common_test/src | |
| parent | 286fbba4880eb58239e03751f088ebbbf38512cd (diff) | |
| parent | 9d1dfb7ec91b9d0ce8357ff4953b3b2dd75c0661 (diff) | |
| download | otp-09d3fe862a7aea715029b88237f0390296eb294a.tar.gz otp-09d3fe862a7aea715029b88237f0390296eb294a.tar.bz2 otp-09d3fe862a7aea715029b88237f0390296eb294a.zip | |
Merge remote-tracking branch 'origin/peppe/common_test/ct_netconfc_action_ok' into maint
* origin/peppe/common_test/ct_netconfc_action_ok:
Handle {ok,Data} in RPC reply (decode_rpc_reply)
OTP-12491
Diffstat (limited to 'lib/common_test/src')
| -rw-r--r-- | lib/common_test/src/ct_netconfc.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl index bded5a15cb..85fb1ea8d2 100644 --- a/lib/common_test/src/ct_netconfc.erl +++ b/lib/common_test/src/ct_netconfc.erl @@ -759,8 +759,9 @@ action(Client,Action) -> Client :: client(), Action :: simple_xml(), Timeout :: timeout(), - Result :: {ok,[simple_xml()]} | {error,error_reason()}. -%% @doc Execute an action. + Result :: ok | {ok,[simple_xml()]} | {error,error_reason()}. +%% @doc Execute an action. If the return type is void, <c>ok</c> will +%% be returned instead of <c>{ok,[simple_xml()]}</c>. %% %% @end %%---------------------------------------------------------------------- @@ -1570,6 +1571,9 @@ decode_ok(Other) -> decode_data([{Tag,Attrs,Content}]) -> case get_local_name_atom(Tag) of + ok -> + %% when action has return type void + ok; data -> %% Since content of data has nothing from the netconf %% namespace, we remove the parent's xmlns attribute here |