From 9d1dfb7ec91b9d0ce8357ff4953b3b2dd75c0661 Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Thu, 5 Mar 2015 15:06:44 +0100
Subject: Handle {ok,Data} in RPC reply (decode_rpc_reply)

OTP-12491
---
 .../test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl           | 11 +++++++++--
 lib/common_test/test/ct_netconfc_SUITE_data/ns.erl            |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'lib/common_test/test')

diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index 2bcfeeec0c..6f5db21f57 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -488,8 +488,15 @@ action(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
     Data = [{myactionreturn,[{xmlns,"myns"}],["value"]}],
-    ?NS:expect_reply(action,{data,Data}),
-    {ok,Data} = ct_netconfc:action(Client,{myaction,[{xmlns,"myns"}],[]}),
+    %% test either to receive {data,Data} or {ok,Data},
+    %% both need to be handled
+    {Reply,RetVal} = case element(3, now()) rem 2 of
+			 0 -> {{data,Data},{ok,Data}};
+			 1 -> {{ok,Data},ok}
+		     end,
+    ct:log("Client will receive {~w,Data}", [element(1,Reply)]),
+    ?NS:expect_reply(action,Reply),
+    RetVal = ct_netconfc:action(Client,{myaction,[{xmlns,"myns"}],[]}),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client),
     ok.
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index fb0734d48e..f503825c4e 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -540,8 +540,13 @@ make_msg({hello,SessionId,Stuff}) ->
 	  SessionIdXml/binary,"</hello>">>);
 make_msg(ok) ->
     xml(rpc_reply("<ok/>"));
+
+make_msg({ok,Data}) ->
+    xml(rpc_reply(from_simple({ok,Data})));
+
 make_msg({data,Data}) ->
     xml(rpc_reply(from_simple({data,Data})));
+
 make_msg(event) ->
     xml(<<"<notification xmlns=\"",?NETCONF_NOTIF_NAMESPACE,"\">"
 	  "<eventTime>2012-06-14T14:50:54+02:00</eventTime>"
-- 
cgit v1.2.3