diff options
| author | Micael Karlberg <bmk@erlang.org> | 2020-02-27 10:38:21 +0100 |
|---|---|---|
| committer | Micael Karlberg <bmk@erlang.org> | 2020-02-27 16:51:47 +0100 |
| commit | e83f2b9aaac652c10d65ecb14648765d4e143636 (patch) | |
| tree | 8faacc9c820cc0fc1ce5a3e7c4a3ed11a79b02b0 | |
| parent | 4956b3a8a5bef1c574c46dc3050df935f1d01b5e (diff) | |
| download | erlang-e83f2b9aaac652c10d65ecb14648765d4e143636.tar.gz | |
[snmp|manager|test] Minimal adjusted manager test suite(s)
Minimal adjustments to the manager test suite(s) to "allow"
for the new netif-sup config option.
OTP-16447
| -rw-r--r-- | lib/snmp/test/snmp_manager_SUITE.erl | 18 | ||||
| -rw-r--r-- | lib/snmp/test/snmp_manager_config_SUITE.erl | 18 |
2 files changed, 20 insertions, 16 deletions
diff --git a/lib/snmp/test/snmp_manager_SUITE.erl b/lib/snmp/test/snmp_manager_SUITE.erl index bc7c5cd46d..337af90a7c 100644 --- a/lib/snmp/test/snmp_manager_SUITE.erl +++ b/lib/snmp/test/snmp_manager_SUITE.erl @@ -609,12 +609,12 @@ init_per_testcase3(Case, Config) -> (Case =:= inform_swarm_cbp_temp) orelse (Case =:= inform_swarm_cbp_perm) -> Verb = [{manager_config_verbosity, silence}, - {manager_note_store_verbosity, silence}, - {manager_server_verbosity, info}, - {manager_net_if_verbosity, info}, - {agent_verbosity, info}, - {agent_net_if_verbosity, info}], - Verb ++ Config; + {manager_note_store_verbosity, silence}, + {manager_server_verbosity, info}, + {manager_net_if_verbosity, info}, + {agent_verbosity, info}, + {agent_net_if_verbosity, info}], + Verb ++ Config; Case =:= otp8395_1 -> [{manager_atl_seqno, true} | Config]; true -> @@ -5484,12 +5484,13 @@ start_manager(Node, Vsns, Conf0, _Opts) -> ConfigVerbosity = get_opt(manager_config_verbosity, Conf0, trace), NoteStoreVerbosity = get_opt(manager_note_store_verbosity, Conf0, log), - ServerVerbosity = get_opt(manager_server_verbosity, Conf0, trace), NetIfVerbosity = get_opt(manager_net_if_verbosity, Conf0, trace), AtlSeqNo = get_opt(manager_atl_seqno, Conf0, false), + ServerVerbosity = get_opt(manager_server_verbosity, Conf0, trace), CBP = get_opt(manager_server_cbproxy, Conf0, temporary), + NIS = get_opt(manager_server_nis, Conf0, none), NetIfConf = case get_opt(manager_net_if_module, Conf0, no_module) of @@ -5512,7 +5513,8 @@ start_manager(Node, Vsns, Conf0, _Opts) -> {verbosity, ConfigVerbosity}]}, {note_store, [{verbosity, NoteStoreVerbosity}]}, {server, [{verbosity, ServerVerbosity}, - {cbproxy, CBP}]}, + {cbproxy, CBP}, + {netif_sup, NIS}]}, {net_if, NetIfConf}], ?line ok = set_mgr_env(Node, Env), diff --git a/lib/snmp/test/snmp_manager_config_SUITE.erl b/lib/snmp/test/snmp_manager_config_SUITE.erl index b5c1894294..3171b3cf28 100644 --- a/lib/snmp/test/snmp_manager_config_SUITE.erl +++ b/lib/snmp/test/snmp_manager_config_SUITE.erl @@ -395,10 +395,16 @@ start_with_all_valid_opts(Conf) when is_list(Conf) -> {options, [{recbuf, 30000}, {bind_to, false}, {no_reuse, false}]}], - ServerOpts = [{timeout, 10000}, {verbosity, trace}], - NoteStoreOpts = [{timeout, 20000}, {verbosity, trace}], - ConfigOpts = [{dir, ConfDir}, {verbosity, trace}, - {db_dir, DbDir}, {db_init_error, create}], + ServerOpts = [{timeout, ?SECS(10)}, + {verbosity, trace}, + {cbproxy, permanent}, + {netif_sup, {?SECS(60), ?SECS(5)}}], + NoteStoreOpts = [{timeout, ?SECS(20)}, + {verbosity, trace}], + ConfigOpts = [{dir, ConfDir}, + {verbosity, trace}, + {db_dir, DbDir}, + {db_init_error, create}], Mibs = [join(StdMibDir, "SNMP-NOTIFICATION-MIB"), join(StdMibDir, "SNMP-USER-BASED-SM-MIB")], Prio = normal, @@ -2317,10 +2323,6 @@ create_and_increment(Conf) when is_list(Conf) -> %% Random init ?SNMP_RAND_SEED(), - %% rand:seed(exrop, - %% {erlang:phash2([node()]), - %% erlang:monotonic_time(), - %% erlang:unique_integer()}), StartVal = rand:uniform(2147483647), IncVal = 42, |