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/test | |
| 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/test')
| -rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | 11 | ||||
| -rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE_data/ns.erl | 5 |
2 files changed, 14 insertions, 2 deletions
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 332e54d1a7..4580528f1b 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 @@ -486,8 +486,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 f7c7b891bb..3c419c8164 100644 --- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl +++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl @@ -548,8 +548,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>" |