diff options
| author | Peter Andersson <[email protected]> | 2015-03-18 10:56:26 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-03-18 10:56:26 +0100 |
| commit | efe02cfb0ec2c44b5fc076787cc8ab40ea83c2b3 (patch) | |
| tree | c3a988ea8d9f4d7dfcbca5f0ac37715766926730 /lib/common_test/src/ct_netconfc.erl | |
| parent | 3f14d81b883fd5a6d853e2d15537da3bbe6084ff (diff) | |
| parent | 09d3fe862a7aea715029b88237f0390296eb294a (diff) | |
| download | otp-efe02cfb0ec2c44b5fc076787cc8ab40ea83c2b3.tar.gz otp-efe02cfb0ec2c44b5fc076787cc8ab40ea83c2b3.tar.bz2 otp-efe02cfb0ec2c44b5fc076787cc8ab40ea83c2b3.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/common_test/src/ct_netconfc.erl')
| -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 14ee55703f..af82f2dcbf 100644 --- a/lib/common_test/src/ct_netconfc.erl +++ b/lib/common_test/src/ct_netconfc.erl @@ -794,8 +794,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 %%---------------------------------------------------------------------- @@ -1606,6 +1607,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 |