diff options
author | Erlang/OTP <[email protected]> | 2015-05-06 10:46:15 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2015-05-06 10:46:15 +0200 |
commit | 9ae8c00c7e3288cd53804b1d0ff10a0825d85297 (patch) | |
tree | 86a367befbc20b6f03fbf1067ca98d854a70f7b1 /lib/common_test/test/ct_netconfc_SUITE_data | |
parent | 6cc8c67c157468566efc869df2c27f8f9c24f38d (diff) | |
parent | 1baa54479df7224985b0889562ecd5701b0805bc (diff) | |
download | otp-9ae8c00c7e3288cd53804b1d0ff10a0825d85297.tar.gz otp-9ae8c00c7e3288cd53804b1d0ff10a0825d85297.tar.bz2 otp-9ae8c00c7e3288cd53804b1d0ff10a0825d85297.zip |
Merge branch 'dgud/common_test/netconf/OTP-12698' into maint-17
* dgud/common_test/netconf/OTP-12698:
common_test: Recurse when there is more data in netconf
Diffstat (limited to 'lib/common_test/test/ct_netconfc_SUITE_data')
-rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | 17 |
1 files changed, 10 insertions, 7 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 a145d85b1d..099deeb980 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 @@ -490,13 +490,16 @@ action(Config) -> Data = [{myactionreturn,[{xmlns,"myns"}],["value"]}], %% 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"}],[]}), + ct:log("Client will receive {~w,~p}", [data,Data]), + ct:log("Expecting ~p", [{ok, Data}]), + ?NS:expect_reply(action,{data, Data}), + {ok, Data} = ct_netconfc:action(Client,{myaction,[{xmlns,"myns"}],[]}), + + ct:log("Client will receive {~w,~p}", [ok,Data]), + ct:log("Expecting ~p", [ok]), + ?NS:expect_reply(action,{ok, Data}), + ok = ct_netconfc:action(Client,{myaction,[{xmlns,"myns"}],[]}), + ?NS:expect_do_reply('close-session',close,ok), ?ok = ct_netconfc:close_session(Client), ok. |