diff options
| author | Siri Hansen <[email protected]> | 2015-12-09 11:48:08 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2015-12-09 11:48:08 +0100 |
| commit | 9d80569b209d37f711ca55c4673d8dd8fbf614fa (patch) | |
| tree | b4ca40f3a7dec82a0da440d15050432d38deb7c8 /lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | |
| parent | 8f91fc9576aa4abadf7e20e5aaabec1b37832145 (diff) | |
| parent | 976214f8d738d4852348496df79f84264d899aba (diff) | |
| download | otp-9d80569b209d37f711ca55c4673d8dd8fbf614fa.tar.gz otp-9d80569b209d37f711ca55c4673d8dd8fbf614fa.tar.bz2 otp-9d80569b209d37f711ca55c4673d8dd8fbf614fa.zip | |
Merge branch 'siri/ct_netconfc/slow-down/OTP-13007' into maint
* siri/ct_netconfc/slow-down/OTP-13007:
Extended table_trans timer in order to handle big data on slow machines
Don't log headings without content
Speed up receive of many small packages
Conflicts:
lib/common_test/src/ct_conn_log_h.erl
Diffstat (limited to 'lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl')
| -rw-r--r-- | lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | 24 |
1 files changed, 18 insertions, 6 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 aaa0723488..ea49e36608 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 @@ -36,7 +36,8 @@ -compile(export_all). suite() -> - [{ct_hooks, [{cth_conn_log, + [{timetrap,?default_timeout}, + {ct_hooks, [{cth_conn_log, [{ct_netconfc,[{log_type,html}, %will be overwritten by config {hosts,[my_named_connection,netconf1]}] }] @@ -72,6 +73,7 @@ all() -> invalid_opt, timeout_close_session, get, + get_a_lot, timeout_get, flush_timeout_get, get_xpath, @@ -113,12 +115,9 @@ end_per_group(_GroupName, Config) -> init_per_testcase(_Case, Config) -> ets:delete_all_objects(ns_tab), - Dog = test_server:timetrap(?default_timeout), - [{watchdog, Dog}|Config]. + Config. -end_per_testcase(_Case, Config) -> - Dog=?config(watchdog, Config), - test_server:timetrap_cancel(Dog), +end_per_testcase(_Case, _Config) -> ok. init_per_suite(Config) -> @@ -352,6 +351,19 @@ get(Config) -> ?ok = ct_netconfc:close_session(Client), ok. +get_a_lot(Config) -> + DataDir = ?config(data_dir,Config), + {ok,Client} = open_success(DataDir), + Descr = lists:append(lists:duplicate(100,"Description of myserver! ")), + Server = {server,[{xmlns,"myns"}],[{name,[],["myserver"]}, + {description,[],[Descr]}]}, + Data = lists:duplicate(100,Server), + ?NS:expect_reply('get',{fragmented,{data,Data}}), + {ok,Data} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]}), + ?NS:expect_do_reply('close-session',close,ok), + ?ok = ct_netconfc:close_session(Client), + ok. + timeout_get(Config) -> DataDir = ?config(data_dir,Config), {ok,Client} = open_success(DataDir), |