diff options
| author | Micael Karlberg <bmk@erlang.org> | 2020-02-24 17:49:28 +0100 |
|---|---|---|
| committer | Micael Karlberg <bmk@erlang.org> | 2020-02-24 17:51:28 +0100 |
| commit | 9a4b62606387aab7fb010f8f436f32e612ada52e (patch) | |
| tree | 71ec51b1c6d890dcb0232e1876e0e4f150c21428 | |
| parent | b4637ff2886590ca815a7e75bed67061c02c1a23 (diff) | |
| download | erlang-9a4b62606387aab7fb010f8f436f32e612ada52e.tar.gz | |
[snmp|test] Manager config suite print cleanup
| -rw-r--r-- | lib/snmp/test/snmp_manager_config_SUITE.erl | 861 |
1 files changed, 441 insertions, 420 deletions
diff --git a/lib/snmp/test/snmp_manager_config_SUITE.erl b/lib/snmp/test/snmp_manager_config_SUITE.erl index b5c1894294..384edb5f93 100644 --- a/lib/snmp/test/snmp_manager_config_SUITE.erl +++ b/lib/snmp/test/snmp_manager_config_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2019. All Rights Reserved. +%% Copyright Ericsson AB 2004-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ %%---------------------------------------------------------------------- -module(snmp_manager_config_SUITE). + %%---------------------------------------------------------------------- %% Include files %%---------------------------------------------------------------------- @@ -97,6 +98,7 @@ ]). + %%---------------------------------------------------------------------- %% Internal exports %%---------------------------------------------------------------------- @@ -219,24 +221,40 @@ otp_8395_cases() -> otp_8395_4 ]. + init_per_suite(Config0) when is_list(Config0) -> - ?DBG("init_per_suite -> entry with" - "~n Config0: ~p", [Config0]), + ?IPRINT("init_per_suite -> entry with" + "~n Config0: ~p", [Config0]), - Config1 = snmp_test_lib:init_suite_top_dir(?MODULE, Config0), + case ?LIB:init_per_suite(Config0) of + {skip, _} = SKIP -> + SKIP; - ?DBG("init_per_suite -> done when" - "~n Config1: ~p", [Config1]), + Config1 -> - Config1. + Config2 = snmp_test_lib:init_suite_top_dir(?MODULE, Config1), -end_per_suite(Config) when is_list(Config) -> + %% We need one on this node also + snmp_test_sys_monitor:start(), - ?DBG("end_per_suite -> entry with" - "~n Config: ~p", [Config]), + ?IPRINT("init_per_suite -> end when" + "~n Config: ~p", [Config2]), - Config. + Config2 + end. + +end_per_suite(Config0) when is_list(Config0) -> + + ?IPRINT("end_per_suite -> entry with" + "~n Config0: ~p", [Config0]), + + snmp_test_sys_monitor:stop(), + Config1 = ?LIB:end_per_suite(Config0), + + ?IPRINT("end_per_suite -> end"), + + Config1. init_per_group(_GroupName, Config) -> @@ -247,11 +265,16 @@ end_per_group(_GroupName, Config) -> init_per_testcase(Case, Config) when is_list(Config) -> - p("init_per_testcase -> Case: ~p", [Case]), + ?IPRINT("init_per_testcase -> entry with" + "~n Config: ~p", [Config]), + + snmp_test_global_sys_monitor:reset_events(), + SuiteTopDir = ?config(snmp_suite_top_dir, Config), CaseTopDir = filename:join(SuiteTopDir, atom_to_list(Case)), ?line ok = file:make_dir(CaseTopDir), - p("init_per_testcase -> CaseTopDir: ~p", [CaseTopDir]), + + ?IPRINT("init_per_testcase -> CaseTopDir: ~p", [CaseTopDir]), MgrTopDir = filename:join(CaseTopDir, "manager/"), ?line ok = file:make_dir(MgrTopDir), MgrConfDir = filename:join(MgrTopDir, "conf/"), @@ -265,15 +288,26 @@ init_per_testcase(Case, Config) when is_list(Config) -> end, MgrLogDir = filename:join(MgrTopDir, "log/"), ?line ok = file:make_dir(MgrLogDir), - [{case_top_dir, CaseTopDir}, - {manager_dir, MgrTopDir}, - {manager_conf_dir, MgrConfDir}, - {manager_db_dir, MgrDbDir}, - {manager_log_dir, MgrLogDir} | Config]. + Config1 = [{case_top_dir, CaseTopDir}, + {manager_dir, MgrTopDir}, + {manager_conf_dir, MgrConfDir}, + {manager_db_dir, MgrDbDir}, + {manager_log_dir, MgrLogDir} | Config], + + ?IPRINT("init_per_testcase -> done when" + "~n Config1: ~p", [Config1]), + + Config1. + + +end_per_testcase(_Case, Config) when is_list(Config) -> + + ?IPRINT("end_per_testcase -> entry with" + "~n Config: ~p", [Config]), + ?IPRINT("system events during test: " + "~n ~p", [snmp_test_global_sys_monitor:events()]), -end_per_testcase(Case, Config) when is_list(Config) -> - p("end_per_testcase -> Case: ~p", [Case]), %% The cleanup is removed due to some really discusting NFS behaviour... %% Also, it can always be useful to retain "all the stuff" after %% the test case in case of debugging... @@ -293,8 +327,8 @@ simple_start_and_stop(doc) -> "Start the snmp manager config process with the \n" "minimum setof options (config dir)."; simple_start_and_stop(Conf) when is_list(Conf) -> - put(tname,ssas), - p("start"), + put(tname, "SIME-START_AND_STOP"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -319,9 +353,9 @@ start_without_mandatory_opts1(doc) -> "Start the snmp manager config process with some of the \n" "mandatory options missing."; start_without_mandatory_opts1(Conf) when is_list(Conf) -> - put(tname,swomo1), - put(verbosity,trace), - p("start"), + put(tname, "START-WO-MAND-OPTS-1"), + put(verbosity, trace), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -330,12 +364,12 @@ start_without_mandatory_opts1(Conf) when is_list(Conf) -> %% config, but no dir: - p("config option, but no dir"), + ?IPRINT("config option, but no dir"), Opts = [{priority, normal}, {config, [{verbosity, trace}, {db_dir, DbDir}]}, {mibs, []}], ?line {error, {missing_mandatory,dir}} = config_start(Opts), - p("done"), + ?IPRINT("done"), ok. @@ -348,9 +382,9 @@ start_without_mandatory_opts2(doc) -> "Start the snmp manager config process with some of the \n" "mandatory options missing."; start_without_mandatory_opts2(Conf) when is_list(Conf) -> - put(tname,swomo2), + put(tname, "START-WO-MAND-OPTS-2"), put(verbosity,trace), - p("start"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), @@ -358,13 +392,13 @@ start_without_mandatory_opts2(Conf) when is_list(Conf) -> %% Second set of options (no config): - p("no config option"), + ?IPRINT("no config option"), Opts = [{priority, normal}, {mibs, []}], ?line {error, {missing_mandatory,config,[dir, db_dir]}} = config_start(Opts), - p("done"), + ?IPRINT("done"), ok. @@ -377,8 +411,9 @@ start_with_all_valid_opts(doc) -> "Start the snmp manager config process with the \n" "complete set of all the valid options."; start_with_all_valid_opts(Conf) when is_list(Conf) -> + put(tname, "START-W-ALL-VALID-OPTS"), put(tname,swavo), - p("start"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -389,7 +424,7 @@ start_with_all_valid_opts(Conf) when is_list(Conf) -> %% Third set of options (no versions): - p("all options"), + ?IPRINT("all options"), NetIfOpts = [{module, snmpm_net_if}, {verbosity, trace}, {options, [{recbuf, 30000}, @@ -418,7 +453,7 @@ start_with_all_valid_opts(Conf) when is_list(Conf) -> ?line {ok, _Pid} = config_start(Opts), ?line ok = config_stop(), - p("done"), + ?IPRINT("done"), ok. @@ -431,8 +466,8 @@ start_with_unknown_opts(doc) -> "Start the snmp manager config process when some of\n" "the options are unknown."; start_with_unknown_opts(Conf) when is_list(Conf) -> - put(tname,swuo), - p("start"), + put(tname, "START-W-UNKNOWN-OPTS"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -443,7 +478,7 @@ start_with_unknown_opts(Conf) when is_list(Conf) -> %% Third set of options (no versions): - p("all options"), + ?IPRINT("all options"), NetIfOpts = [{module, snmpm_net_if}, {verbosity, trace}, {options, [{recbuf, 30000}, @@ -471,7 +506,7 @@ start_with_unknown_opts(Conf) when is_list(Conf) -> {versions, Vsns}], ?line {ok, _Pid} = config_start(Opts), - p("done"), + ?IPRINT("done"), ok. @@ -484,8 +519,8 @@ start_with_incorrect_opts(doc) -> "Start the snmp manager config process when some of\n" "the options has incorrect values."; start_with_incorrect_opts(Conf) when is_list(Conf) -> - put(tname,swio), - p("start"), + put(tname, "START-W-INCORRECT-OPTS"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -496,135 +531,135 @@ start_with_incorrect_opts(Conf) when is_list(Conf) -> ConfigOpts = [{verbosity,trace}, {dir, ConfDir}, {db_dir, DbDir}], - p("net-if - incorrect module"), + ?IPRINT("net-if - incorrect module"), NetIfOpts1 = [{module, snmpm_user}], %% Behaviour check will fail Opts01 = [{config, ConfigOpts}, {versions, [v1]}, {net_if, NetIfOpts1}], ?line {error, Reason01} = config_start(Opts01), - p("net-if (module) res: ~p", [Reason01]), + ?IPRINT("net-if (module) res: ~p", [Reason01]), - p("net-if - incorrect verbosity"), + ?IPRINT("net-if - incorrect verbosity"), NetIfOpts2 = [{verbosity, invalid_verbosity}], Opts02 = [{config, ConfigOpts}, {versions, [v1]}, {net_if, NetIfOpts2}], ?line {error, Reason02} = config_start(Opts02), - p("net-if (verbosity) res: ~p", [Reason02]), + ?IPRINT("net-if (verbosity) res: ~p", [Reason02]), - p("net-if - incorrect options"), + ?IPRINT("net-if - incorrect options"), NetIfOpts3 = [{options, invalid_options}], Opts03 = [{config, ConfigOpts}, {versions, [v1]}, {net_if, NetIfOpts3}], ?line {error, Reason03} = config_start(Opts03), - p("net-if (options) res: ~p", [Reason03]), + ?IPRINT("net-if (options) res: ~p", [Reason03]), - p("server - incorrect timeout (1)"), + ?IPRINT("server - incorrect timeout (1)"), ServerOpts1 = [{timeout, invalid_timeout}], Opts08 = [{config, ConfigOpts}, {versions, [v1]}, {server, ServerOpts1}], ?line {error, Reason08} = config_start(Opts08), - p("server (timeout) res: ~p", [Reason08]), + ?IPRINT("server (timeout) res: ~p", [Reason08]), - p("server - incorrect timeout (2)"), + ?IPRINT("server - incorrect timeout (2)"), ServerOpts2 = [{timeout, 0}], Opts09 = [{config, ConfigOpts}, {versions, [v1]}, {server, ServerOpts2}], ?line {error, Reason09} = config_start(Opts09), - p("server (timeout) res: ~p", [Reason09]), + ?IPRINT("server (timeout) res: ~p", [Reason09]), - p("server - incorrect timeout (3)"), + ?IPRINT("server - incorrect timeout (3)"), ServerOpts3 = [{timeout, -1000}], Opts10 = [{config, ConfigOpts}, {versions, [v1]}, {server, ServerOpts3}], ?line {error, Reason10} = config_start(Opts10), - p("server (timeout) res: ~p", [Reason10]), + ?IPRINT("server (timeout) res: ~p", [Reason10]), - p("server - incorrect verbosity"), + ?IPRINT("server - incorrect verbosity"), ServerOpts4 = [{verbosity, invalid_verbosity}], Opts11 = [{config, ConfigOpts}, {versions, [v1]}, {server, ServerOpts4}], ?line {error, Reason11} = config_start(Opts11), - p("server (verbosity) res: ~p", [Reason11]), + ?IPRINT("server (verbosity) res: ~p", [Reason11]), - p("note-store - incorrect timeout (1)"), + ?IPRINT("note-store - incorrect timeout (1)"), NoteStoreOpts1 = [{timeout, invalid_timeout}], Opts12 = [{config, ConfigOpts}, {versions, [v1]}, {note_store, NoteStoreOpts1}], ?line {error, Reason12} = config_start(Opts12), - p("note-store (timeout) res: ~p", [Reason12]), + ?IPRINT("note-store (timeout) res: ~p", [Reason12]), - p("note-store - incorrect timeout (2)"), + ?IPRINT("note-store - incorrect timeout (2)"), NoteStoreOpts2 = [{timeout, 0}], Opts13 = [{config, ConfigOpts}, {versions, [v1]}, {note_store, NoteStoreOpts2}], ?line {error, Reason13} = config_start(Opts13), - p("note-store (timeout) res: ~p", [Reason13]), + ?IPRINT("note-store (timeout) res: ~p", [Reason13]), - p("note-store - incorrect timeout (3)"), + ?IPRINT("note-store - incorrect timeout (3)"), NoteStoreOpts3 = [{timeout, -2000}], Opts14 = [{config, ConfigOpts}, {versions, [v1]}, {note_store, NoteStoreOpts3}], ?line {error, Reason14} = config_start(Opts14), - p("note-store (timeout) res: ~p", [Reason14]), + ?IPRINT("note-store (timeout) res: ~p", [Reason14]), - p("note-store - incorrect verbosity"), + ?IPRINT("note-store - incorrect verbosity"), NoteStoreOpts4 = [{timeout, 20000}, {verbosity, invalid_verbosity}], Opts15 = [{config, ConfigOpts}, {versions, [v1]}, {note_store, NoteStoreOpts4}], ?line {error, Reason15} = config_start(Opts15), - p("note-store (verbosity) res: ~p", [Reason15]), + ?IPRINT("note-store (verbosity) res: ~p", [Reason15]), - p("config - incorrect dir (1)"), + ?IPRINT("config - incorrect dir (1)"), ConfigOpts1 = [{dir, invalid_dir}], Opts16 = [{config, ConfigOpts1}, {versions, [v1]}], ?line {error, Reason16} = config_start(Opts16), - p("config (dir) res: ~p", [Reason16]), + ?IPRINT("config (dir) res: ~p", [Reason16]), - p("config - incorrect dir (2)"), + ?IPRINT("config - incorrect dir (2)"), ConfigOpts2 = [{dir, "/invalid/dir"}], Opts17 = [{config, ConfigOpts2}, {versions, [v1]}], ?line {error, Reason17} = config_start(Opts17), - p("config (dir) res: ~p", [Reason17]), + ?IPRINT("config (dir) res: ~p", [Reason17]), - p("config - incorrect verbosity"), + ?IPRINT("config - incorrect verbosity"), ConfigOpts3 = [{dir, ConfDir}, {verbosity, invalid_verbosity}], Opts18 = [{config, ConfigOpts3}, {versions, [v1]}], ?line {error, Reason18} = config_start(Opts18), - p("config (verbosity) res: ~p", [Reason18]), + ?IPRINT("config (verbosity) res: ~p", [Reason18]), - p("mibs - incorrect mibs (1)"), + ?IPRINT("mibs - incorrect mibs (1)"), Mibs1 = invalid_mibs, Opts19 = [{config, ConfigOpts}, {versions, [v1]}, {mibs, Mibs1}], ?line {error, Reason19} = config_start(Opts19), - p("mibs (mibs) res: ~p", [Reason19]), + ?IPRINT("mibs (mibs) res: ~p", [Reason19]), - p("mibs - incorrect mibs (2)"), + ?IPRINT("mibs - incorrect mibs (2)"), Mibs2 = [join(StdMibDir, "INVALID-MIB")], Opts20 = [{config, ConfigOpts}, {versions, [v1]}, {mibs, Mibs2}], ?line {error, Reason20} = config_start(Opts20), - p("mibs (mibs) res: ~p", [Reason20]), + ?IPRINT("mibs (mibs) res: ~p", [Reason20]), - p("prio - incorrect prio"), + ?IPRINT("prio - incorrect prio"), Prio1 = invalid_prio, Opts21 = [{config, ConfigOpts}, {versions, [v1]}, {priority, Prio1}], ?line {error, Reason21} = config_start(Opts21), - p("prio (prio) res: ~p", [Reason21]), + ?IPRINT("prio (prio) res: ~p", [Reason21]), - p("atl - incorrect type"), + ?IPRINT("atl - incorrect type"), ATL1 = [{type, invalid_type}, {dir, LogDir}, {size, {10,10240}}, @@ -633,9 +668,9 @@ start_with_incorrect_opts(Conf) when is_list(Conf) -> {versions, [v1]}, {audit_trail_log, ATL1}], ?line {error, Reason22} = config_start(Opts22), - p("atl (type) res: ~p", [Reason22]), + ?IPRINT("atl (type) res: ~p", [Reason22]), - p("atl - incorrect dir (1)"), + ?IPRINT("atl - incorrect dir (1)"), ATL2 = [{type, read_write}, {dir, invalid_dir}, {size, {10,10240}}, @@ -644,9 +679,9 @@ start_with_incorrect_opts(Conf) when is_list(Conf) -> {versions, [v1]}, {audit_trail_log, ATL2}], ?line {error, Reason23} = config_start(Opts23), - p("atl (dir) res: ~p", [Reason23]), + ?IPRINT("atl (dir) res: ~p", [Reason23]), - p("atl - incorrect dir (2)"), + ?IPRINT("atl - incorrect dir (2)"), ATL3 = [{type, read_write}, {dir, "/invalid/dir"}, {size, {10,10240}}, @@ -655,9 +690,9 @@ start_with_incorrect_opts(Conf) when is_list(Conf) -> {versions, [v1]}, {audit_trail_log, ATL3}], ?line {error, Reason24} = config_start(Opts24), - p("atl (dir) res: ~p", [Reason24]), + ?IPRINT("atl (dir) res: ~p", [Reason24]), - p("atl - incorrect size (1)"), + ?IPRINT("atl - incorrect size (1)"), ATL4 = [{type, read_write}, {dir, LogDir}, {size, invalid_size}, @@ -666,9 +701,9 @@ start_with_incorrect_opts(Conf) when is_list(Conf) -> {versions, [v1]}, {audit_trail_log, ATL4}], ?line {error, Reason25} = config_start(Opts25), - p("atl (size) res: ~p", [Reason25]), + ?IPRINT("atl (size) res: ~p", [Reason25]), - p("atl - incorrect size (2)"), + ?IPRINT("atl - incorrect size (2)"), ATL5 = [{type, read_write}, {dir, LogDir}, {size, {10,invalid_file_size}}, @@ -677,9 +712,9 @@ start_with_incorrect_opts(Conf) when is_list(Conf) -> {versions, [v1]}, {audit_trail_log, ATL5}], ?line {error, Reason26} = config_start(Opts26), - p("atl (size) res: ~p", [Reason26]), + ?IPRINT("atl (size) res: ~p", [Reason26]), - p("atl - incorrect size (3)"), + ?IPRINT("atl - incorrect size (3)"), ATL6 = [{type, read_write}, {dir, LogDir}, {size, {invalid_file_num,10240}}, @@ -688,9 +723,9 @@ start_with_incorrect_opts(Conf) when is_list(Conf) -> {versions, [v1]}, {audit_trail_log, ATL6}], ?line {error, Reason27} = config_start(Opts27), - p("atl (size) res: ~p", [Reason27]), + ?IPRINT("atl (size) res: ~p", [Reason27]), - p("atl - incorrect repair"), + ?IPRINT("atl - incorrect repair"), ATL7 = [{type, read_write}, {dir, LogDir}, {size, {10,10240}}, @@ -699,23 +734,23 @@ start_with_incorrect_opts(Conf) when is_list(Conf) -> {versions, [v1]}, {audit_trail_log, ATL7}], ?line {error, Reason28} = config_start(Opts28), - p("atl (repair) res: ~p", [Reason28]), + ?IPRINT("atl (repair) res: ~p", [Reason28]), - p("version - incorrect versions (1)"), + ?IPRINT("version - incorrect versions (1)"), Vsns1 = invalid_vsns, Opts29 = [{config, ConfigOpts}, {versions, Vsns1}], ?line {error, Reason29} = config_start(Opts29), - p("versions (versions) res: ~p", [Reason29]), + ?IPRINT("versions (versions) res: ~p", [Reason29]), - p("version - incorrect versions (2)"), + ?IPRINT("version - incorrect versions (2)"), Vsns2 = [v1,v2,v3,v9], Opts30 = [{config, ConfigOpts}, {versions, Vsns2}], ?line {error, Reason30} = config_start(Opts30), - p("versions (versions) res: ~p", [Reason30]), + ?IPRINT("versions (versions) res: ~p", [Reason30]), - p("done"), + ?IPRINT("done"), ok. @@ -727,8 +762,8 @@ start_with_invalid_manager_conf_file1(suite) -> []; start_with_invalid_manager_conf_file1(doc) -> "Start with invalid manager config file (1)."; start_with_invalid_manager_conf_file1(Conf) when is_list(Conf) -> - put(tname,swimcf), - p("start"), + put(tname, "START-W-INV-MGR-CONF-FILE-1"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -737,142 +772,142 @@ start_with_invalid_manager_conf_file1(Conf) when is_list(Conf) -> {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}], %% -- - p("write manager config file with invalid IP address (1)"), + ?IPRINT("write manager config file with invalid IP address (1)"), write_manager_conf(ConfDir, "arne-anka", "4001", "500", "\"bmkEngine\""), ?line {error, Reason11} = config_start(Opts), - p("start failed (as expected): ~p", [Reason11]), + ?IPRINT("start failed (as expected): ~p", [Reason11]), ?line {failed_reading, _, _, 1, {parse_error, _}} = Reason11, await_config_not_running(), %% -- - p("write manager config file with invalid IP address (2)"), + ?IPRINT("write manager config file with invalid IP address (2)"), write_manager_conf(ConfDir, "arne_anka", "4001", "500", "\"bmkEngine\""), ?line {error, Reason12} = config_start(Opts), - p("start failed (as expected): ~p", [Reason12]), + ?IPRINT("start failed (as expected): ~p", [Reason12]), ?line {failed_check, _, _, 2, {bad_address, _}} = Reason12, await_config_not_running(), %% -- - p("write manager config file with invalid IP address (3)"), + ?IPRINT("write manager config file with invalid IP address (3)"), write_manager_conf(ConfDir, "9999", "4001", "500", "\"bmkEngine\""), ?line {error, Reason13} = config_start(Opts), - p("start failed (as expected): ~p", [Reason13]), + ?IPRINT("start failed (as expected): ~p", [Reason13]), ?line {failed_check, _, _, 2, {bad_address, _}} = Reason13, await_config_not_running(), %% -- - p("write manager config file with invalid port (2)"), + ?IPRINT("write manager config file with invalid port (2)"), write_manager_conf(ConfDir, "[134,138,177,189]", "kalle-anka", "500", "\"bmkEngine\""), ?line {error, Reason21} = config_start(Opts), - p("start failed (as expected): ~p", [Reason21]), + ?IPRINT("start failed (as expected): ~p", [Reason21]), ?line {failed_reading, _, _, 2, {parse_error, _}} = Reason21, await_config_not_running(), %% -- - p("write manager config file with invalid port (1)"), + ?IPRINT("write manager config file with invalid port (1)"), write_manager_conf(ConfDir, "[134,138,177,189]", "-1", "500", "\"bmkEngine\""), ?line {error, Reason22} = config_start(Opts), - p("start failed (as expected): ~p", [Reason22]), + ?IPRINT("start failed (as expected): ~p", [Reason22]), io:format("Reason22: ~p~n", [Reason22]), ?line {failed_check, _, _, 3, {bad_port, _}} = Reason22, await_config_not_running(), %% -- - p("write manager config file with invalid port (3)"), + ?IPRINT("write manager config file with invalid port (3)"), write_manager_conf(ConfDir, "[134,138,177,189]", "\"kalle-anka\"", "500", "\"bmkEngine\""), ?line {error, Reason23} = config_start(Opts), - p("start failed (as expected): ~p", [Reason23]), + ?IPRINT("start failed (as expected): ~p", [Reason23]), ?line {failed_check, _, _, 3, {bad_port, _}} = Reason23, await_config_not_running(), %% -- - p("write manager config file with invalid EngineID (1)"), + ?IPRINT("write manager config file with invalid EngineID (1)"), write_manager_conf(ConfDir, "[134,138,177,189]", "4001", "500", "bmkEngine"), ?line {error, Reason31} = config_start(Opts), - p("start failed (as expected): ~p", [Reason31]), + ?IPRINT("start failed (as expected): ~p", [Reason31]), ?line {failed_check, _, _, 5, {invalid_string, _}} = Reason31, await_config_not_running(), %% -- - p("write manager config file with invalid EngineID (2)"), + ?IPRINT("write manager config file with invalid EngineID (2)"), write_manager_conf(ConfDir, "[134,138,177,189]", "4001", "500", "{1,2,3}"), ?line {error, Reason32} = config_start(Opts), - p("start failed (as expected): ~p", [Reason32]), + ?IPRINT("start failed (as expected): ~p", [Reason32]), ?line {failed_check, _, _, 5, {invalid_string, _}} = Reason32, await_config_not_running(), %% -- - p("write manager config file with invalid EngineID (3)"), + ?IPRINT("write manager config file with invalid EngineID (3)"), write_manager_conf(ConfDir, "[134,138,177,189]", "4001", "500", "10101"), ?line {error, Reason33} = config_start(Opts), - p("start failed (as expected): ~p", [Reason33]), + ?IPRINT("start failed (as expected): ~p", [Reason33]), ?line {failed_check, _, _, 5, {invalid_string, _}} = Reason33, await_config_not_running(), %% -- - p("write manager config file with invalid MMS (1)"), + ?IPRINT("write manager config file with invalid MMS (1)"), write_manager_conf(ConfDir, "[134,138,177,189]", "4001", "483", "\"bmkEngine\""), ?line {error, Reason41} = config_start(Opts), - p("start failed (as expected): ~p", [Reason41]), + ?IPRINT("start failed (as expected): ~p", [Reason41]), ?line {failed_check, _, _, 4, {invalid_integer, _}} = Reason41, await_config_not_running(), %% -- - p("write manager config file with invalid MMS (2)"), + ?IPRINT("write manager config file with invalid MMS (2)"), write_manager_conf(ConfDir, "[134,138,177,189]", "4001", "-1", "\"bmkEngine\""), ?line {error, Reason42} = config_start(Opts), - p("start failed (as expected): ~p", [Reason42]), + ?IPRINT("start failed (as expected): ~p", [Reason42]), ?line {failed_check, _, _, 4, {invalid_integer, _}} = Reason42, await_config_not_running(), %% -- - p("write manager config file with invalid MMS (3)"), + ?IPRINT("write manager config file with invalid MMS (3)"), write_manager_conf(ConfDir, "[134,138,177,189]", "4001", "\"kalle-anka\"", "\"bmkEngine\""), ?line {error, Reason43} = config_start(Opts), - p("start failed (as expected): ~p", [Reason43]), + ?IPRINT("start failed (as expected): ~p", [Reason43]), ?line {failed_check, _, _, 4, {invalid_integer, _}} = Reason43, await_config_not_running(), %% -- - p("write manager config file with invalid MMS (4)"), + ?IPRINT("write manager config file with invalid MMS (4)"), write_manager_conf(ConfDir, "[134,138,177,189]", "4001", "kalle_anka", "\"bmkEngine\""), ?line {error, Reason44} = config_start(Opts), - p("start failed (as expected): ~p", [Reason44]), + ?IPRINT("start failed (as expected): ~p", [Reason44]), ?line {failed_check, _, _, 4, {invalid_integer, _}} = Reason44, await_config_not_running(), %% -- - p("write manager config file with unknown option"), + ?IPRINT("write manager config file with unknown option"), write_manager_conf(ConfDir, "{kalle, anka}."), ?line {error, Reason51} = config_start(Opts), - p("start failed (as expected): ~p", [Reason51]), + ?IPRINT("start failed (as expected): ~p", [Reason51]), ?line {failed_check, _, _, 1, {unknown_config, _}} = Reason51, await_config_not_running(), %% -- - p("write manager config file with unknown option"), + ?IPRINT("write manager config file with unknown option"), write_manager_conf(ConfDir, "kalle_anka."), ?line {error, Reason52} = config_start(Opts), - p("start failed (as expected): ~p", [Reason52]), + ?IPRINT("start failed (as expected): ~p", [Reason52]), ?line {failed_check, _, _, 1, {unknown_config, _}} = Reason52, await_config_not_running(), - p("done"), + ?IPRINT("done"), ok. @@ -884,8 +919,8 @@ start_with_invalid_users_conf_file1(suite) -> []; start_with_invalid_users_conf_file1(doc) -> "Start with invalid users config file."; start_with_invalid_users_conf_file1(Conf) when is_list(Conf) -> - put(tname,swiucf), - p("start"), + put(tname, "START-W-INV-USER-CONF-FILE-1"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -899,74 +934,74 @@ start_with_invalid_users_conf_file1(Conf) when is_list(Conf) -> write_manager_conf(ConfDir), %% -- - p("write users config file with invalid module (1)"), + ?IPRINT("write users config file with invalid module (1)"), write_users_conf(ConfDir, [{"kalle", "kalle", "dummy"}]), ?line {error, Reason11} = config_start(Opts), - p("start failed (as expected): ~p", [Reason11]), + ?IPRINT("start failed (as expected): ~p", [Reason11]), ?line {failed_check, _, _, _, {bad_module, kalle}} = Reason11, await_config_not_running(), %% -- - p("write users config file with invalid module (1)"), + ?IPRINT("write users config file with invalid module (1)"), write_users_conf(ConfDir, [{"kalle", "snmpm", "dummy"}]), ?line {error, Reason12} = config_start(Opts), - p("start failed (as expected): ~p", [Reason12]), + ?IPRINT("start failed (as expected): ~p", [Reason12]), ?line {failed_check, _, _, _, {bad_module, _}} = Reason12, await_config_not_running(), %% -- - p("write users config file with invalid module (2)"), + ?IPRINT("write users config file with invalid module (2)"), write_users_conf(ConfDir, [{"kalle1", "10101", "dummy"}]), ?line {error, Reason13} = config_start(Opts), - p("start failed (as expected): ~p", [Reason13]), + ?IPRINT("start failed (as expected): ~p", [Reason13]), ?line {failed_check, _, _, _, {bad_module, _}} = Reason13, await_config_not_running(), %% -- - p("write users config file with invalid user tuple (1)"), + ?IPRINT("write users config file with invalid user tuple (1)"), write_users_conf2(ConfDir, "{kalle, snmpm_user_default}."), ?line {error, Reason21} = config_start(Opts), - p("start failed (as expected): ~p", [Reason21]), + ?IPRINT("start failed (as expected): ~p", [Reason21]), ?line {failed_check, _, _, _, {bad_user_config, _}} = Reason21, await_config_not_running(), %% -- - p("write users config file with invalid user tuple (2)"), + ?IPRINT("write users config file with invalid user tuple (2)"), write_users_conf2(ConfDir, "{kalle, snmpm_user_default, kalle, [], olle}."), ?line {error, Reason22} = config_start(Opts), - p("start failed (as expected): ~p", [Reason22]), + ?IPRINT("start failed (as expected): ~p", [Reason22]), ?line {failed_check, _, _, _, {bad_user_config, _}} = Reason22, await_config_not_running(), %% -- - p("write users config file with invalid user tuple (3)"), + ?IPRINT("write users config file with invalid user tuple (3)"), write_users_conf2(ConfDir, "snmpm_user_default."), ?line {error, Reason23} = config_start(Opts), - p("start failed (as expected): ~p", [Reason23]), + ?IPRINT("start failed (as expected): ~p", [Reason23]), ?line {failed_check, _, _, _, {bad_user_config, _}} = Reason23, await_config_not_running(), %% -- - p("write users config file with invalid user tuple (4)"), + ?IPRINT("write users config file with invalid user tuple (4)"), write_users_conf2(ConfDir, "[kalle, snmpm_user_default, kalle]."), ?line {error, Reason24} = config_start(Opts), - p("start failed (as expected): ~p", [Reason24]), + ?IPRINT("start failed (as expected): ~p", [Reason24]), ?line {failed_check, _, _, _, {bad_user_config, _}} = Reason24, await_config_not_running(), %% -- - p("write users config file with invalid user agent default config (1)"), + ?IPRINT("write users config file with invalid user agent default config (1)"), write_users_conf2(ConfDir, "{kalle, snmpm_user_default, kalle, olle}."), ?line {error, Reason31} = config_start(Opts), - p("start failed (as expected): ~p", [Reason31]), + ?IPRINT("start failed (as expected): ~p", [Reason31]), ?line {failed_check, _, _, _, {bad_default_agent_config, _}} = Reason31, await_config_not_running(), %% -- - p("write users config file with invalid user agent default config (2)"), + ?IPRINT("write users config file with invalid user agent default config (2)"), write_users_conf2(ConfDir, "{kalle, snmpm_user_default, kalle, [olle]}."), ?line {error, Reason32} = config_start(Opts), - p("start failed (as expected): ~p", [Reason32]), + ?IPRINT("start failed (as expected): ~p", [Reason32]), %% ?line {failed_check, _, _, _, {bad_default_agent_config, _}} = Reason32, case Reason32 of {failed_check, _, _, _, {bad_default_agent_config, _}} -> @@ -976,7 +1011,7 @@ start_with_invalid_users_conf_file1(Conf) when is_list(Conf) -> end, await_config_not_running(), - p("done"), + ?IPRINT("done"), ok. @@ -988,8 +1023,8 @@ start_with_invalid_agents_conf_file1(suite) -> []; start_with_invalid_agents_conf_file1(doc) -> "Start with invalid agents config file."; start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> - put(tname, swiacf), - p("start"), + put(tname, "START-W-INV-AGS-CONF-FILE-1"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -1009,12 +1044,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> "any", "\"initial\"", "noAuthNoPriv"}, %% -- - p("[test 11] write agents config file with invalid user (1)"), + ?IPRINT("[test 11] write agents config file with invalid user (1)"), Agent11 = setelement(1, Agent0, "kalle-anka"), write_agents_conf(ConfDir, [Agent11]), case config_start(Opts) of {error, Reason11} -> - p("start failed (as expected): ~p", [Reason11]), + ?IPRINT("start failed (as expected): ~p", [Reason11]), ?line {failed_reading, _, _, _, {parse_error, _}} = Reason11, await_config_not_running(); OK_11 -> @@ -1022,12 +1057,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 21] write agents config file with invalid target name (1)"), + ?IPRINT("[test 21] write agents config file with invalid target name (1)"), Agent21 = setelement(2, Agent0, "targ-hobbes"), write_agents_conf(ConfDir, [Agent21]), case config_start(Opts) of {error, Reason21} -> - p("start failed (as expected): ~p", [Reason21]), + ?IPRINT("start failed (as expected): ~p", [Reason21]), ?line {failed_reading, _, _, _, {parse_error, _}} = Reason21, await_config_not_running(); OK_21 -> @@ -1035,12 +1070,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 22] write agents config file with invalid target name (2)"), + ?IPRINT("[test 22] write agents config file with invalid target name (2)"), Agent22 = setelement(2, Agent0, "targ_hobbes"), write_agents_conf(ConfDir, [Agent22]), case config_start(Opts) of {error, Reason22} -> - p("start failed (as expected): ~p", [Reason22]), + ?IPRINT("start failed (as expected): ~p", [Reason22]), ?line {failed_check, _, _, _, {invalid_string, _}} = Reason22, await_config_not_running(); OK_22 -> @@ -1048,12 +1083,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 23] write agents config file with invalid target name (3)"), + ?IPRINT("[test 23] write agents config file with invalid target name (3)"), Agent23 = setelement(2, Agent0, "10101"), write_agents_conf(ConfDir, [Agent23]), case config_start(Opts) of {error, Reason23} -> - p("start failed (as expected): ~p", [Reason23]), + ?IPRINT("start failed (as expected): ~p", [Reason23]), ?line {failed_check, _, _, _, {invalid_string, _}} = Reason23, await_config_not_running(); OK_23 -> @@ -1061,12 +1096,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 31] write agents config file with invalid community (1)"), + ?IPRINT("[test 31] write agents config file with invalid community (1)"), Agent31 = setelement(3, Agent0, "targ-hobbes"), write_agents_conf(ConfDir, [Agent31]), case config_start(Opts) of {error, Reason31} -> - p("start failed (as expected): ~p", [Reason31]), + ?IPRINT("start failed (as expected): ~p", [Reason31]), ?line {failed_reading, _, _, _, {parse_error, _}} = Reason31, await_config_not_running(); OK_31 -> @@ -1074,12 +1109,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 32] write agents config file with invalid community (2)"), + ?IPRINT("[test 32] write agents config file with invalid community (2)"), Agent32 = setelement(3, Agent0, "targ_hobbes"), write_agents_conf(ConfDir, [Agent32]), case config_start(Opts) of {error, Reason32} -> - p("start failed (as expected): ~p", [Reason32]), + ?IPRINT("start failed (as expected): ~p", [Reason32]), ?line {failed_check, _, _, _, {invalid_string, _}} = Reason32, await_config_not_running(); OK_32 -> @@ -1087,12 +1122,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 33] write agents config file with invalid community (3)"), + ?IPRINT("[test 33] write agents config file with invalid community (3)"), Agent33 = setelement(3, Agent0, "10101"), write_agents_conf(ConfDir, [Agent33]), case config_start(Opts) of {error, Reason33} -> - p("start failed (as expected): ~p", [Reason33]), + ?IPRINT("start failed (as expected): ~p", [Reason33]), ?line {failed_check, _, _, _, {invalid_string, _}} = Reason33, await_config_not_running(); OK_33 -> @@ -1100,12 +1135,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 51] write agents config file with invalid ip (1)"), + ?IPRINT("[test 51] write agents config file with invalid ip (1)"), Agent51 = setelement(4, Agent0, "kalle_anka"), write_agents_conf(ConfDir, [Agent51]), case config_start(Opts) of {error, Reason51} -> - p("start failed (as expected): ~p", [Reason51]), + ?IPRINT("start failed (as expected): ~p", [Reason51]), ?line {failed_check, _, _, _, {bad_domain, _}} = Reason51, await_config_not_running(); OK_51 -> @@ -1113,12 +1148,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 52] write agents config file with invalid ip (2)"), + ?IPRINT("[test 52] write agents config file with invalid ip (2)"), Agent52 = setelement(4, Agent0, "10101"), write_agents_conf(ConfDir, [Agent52]), case config_start(Opts) of {error, Reason52} -> - p("start failed (as expected): ~p", [Reason52]), + ?IPRINT("start failed (as expected): ~p", [Reason52]), ?line {failed_check, _, _, _, {bad_address, _}} = Reason52, await_config_not_running(); OK_52 -> @@ -1126,12 +1161,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 53] write agents config file with invalid ip (3)"), + ?IPRINT("[test 53] write agents config file with invalid ip (3)"), Agent53 = setelement(4, Agent0, "[192,168,0]"), write_agents_conf(ConfDir, [Agent53]), case config_start(Opts) of {error, Reason53} -> - p("start failed (as expected): ~p", [Reason53]), + ?IPRINT("start failed (as expected): ~p", [Reason53]), ?line {failed_check, _, _, _, {bad_address, _}} = Reason53, await_config_not_running(); OK_53 -> @@ -1139,12 +1174,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 54] write agents config file with invalid ip (4)"), + ?IPRINT("[test 54] write agents config file with invalid ip (4)"), Agent54 = setelement(4, Agent0, "[192,168,0,100,99]"), write_agents_conf(ConfDir, [Agent54]), case config_start(Opts) of {error, Reason54} -> - p("start failed (as expected): ~p", [Reason54]), + ?IPRINT("start failed (as expected): ~p", [Reason54]), ?line {failed_check, _, _, _, {bad_address, _}} = Reason54, await_config_not_running(); OK_54 -> @@ -1152,174 +1187,174 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test 55] write agents config file with invalid ip (5)"), + ?IPRINT("[test 55] write agents config file with invalid ip (5)"), Agent55 = setelement(4, Agent0, "[192,168,0,arne]"), write_agents_conf(ConfDir, [Agent55]), ?line {error, Reason55} = config_start(Opts), - p("start failed (as expected): ~p", [Reason55]), + ?IPRINT("start failed (as expected): ~p", [Reason55]), ?line {failed_check, _, _, _, {bad_address, _}} = Reason55, await_config_not_running(), %% -- - p("[test 61] write agents config file with invalid port (1)"), + ?IPRINT("[test 61] write agents config file with invalid port (1)"), Agent61 = setelement(5, Agent0, "kalle_anka"), write_agents_conf(ConfDir, [Agent61]), ?line {error, Reason61} = config_start(Opts), - p("start failed (as expected): ~p", [Reason61]), + ?IPRINT("start failed (as expected): ~p", [Reason61]), ?line {failed_check, _, _, _, {bad_address, _}} = Reason61, await_config_not_running(), %% -- - p("[test 62] write agents config file with invalid port (2)"), + ?IPRINT("[test 62] write agents config file with invalid port (2)"), Agent62 = setelement(5, Agent0, "-1"), write_agents_conf(ConfDir, [Agent62]), ?line {error, Reason62} = config_start(Opts), - p("start failed (as expected): ~p", [Reason62]), + ?IPRINT("start failed (as expected): ~p", [Reason62]), ?line {failed_check, _, _, _, {bad_address, _}} = Reason62, await_config_not_running(), %% -- - p("[test 63] write agents config file with invalid port (3)"), + ?IPRINT("[test 63] write agents config file with invalid port (3)"), Agent63 = setelement(5, Agent0, "\"100\""), write_agents_conf(ConfDir, [Agent63]), ?line {error, Reason63} = config_start(Opts), - p("start failed (as expected): ~p", [Reason63]), + ?IPRINT("start failed (as expected): ~p", [Reason63]), ?line {failed_check, _, _, _, {bad_address, _}} = Reason63, await_config_not_running(), %% -- - p("[test 71] write agents config file with invalid engine-id (1)"), + ?IPRINT("[test 71] write agents config file with invalid engine-id (1)"), Agent71 = setelement(6, Agent0, "kalle_anka"), write_agents_conf(ConfDir, [Agent71]), ?line {error, Reason71} = config_start(Opts), - p("start failed (as expected): ~p", [Reason71]), + ?IPRINT("start failed (as expected): ~p", [Reason71]), ?line {failed_check, _, _, _, {invalid_string, _}} = Reason71, await_config_not_running(), %% -- - p("[test 72] write agents config file with invalid engine-id (2)"), + ?IPRINT("[test 72] write agents config file with invalid engine-id (2)"), Agent72 = setelement(6, Agent0, "10101"), write_agents_conf(ConfDir, [Agent72]), ?line {error, Reason72} = config_start(Opts), - p("start failed (as expected): ~p", [Reason72]), + ?IPRINT("start failed (as expected): ~p", [Reason72]), ?line {failed_check, _, _, _, {invalid_string, _}} = Reason72, await_config_not_running(), %% -- - p("[test 81] write agents config file with invalid timeout (1)"), + ?IPRINT("[test 81] write agents config file with invalid timeout (1)"), Agent81 = setelement(7, Agent0, "kalle_anka"), write_agents_conf(ConfDir, [Agent81]), ?line {error, Reason81} = config_start(Opts), - p("start failed (as expected): ~p", [Reason81]), + ?IPRINT("start failed (as expected): ~p", [Reason81]), ?line {failed_check, _, _, _, {invalid_timer, _}} = Reason81, await_config_not_running(), %% -- - p("[test 82] write agents config file with invalid timeout (2)"), + ?IPRINT("[test 82] write agents config file with invalid timeout (2)"), Agent82 = setelement(7, Agent0, "-1"), write_agents_conf(ConfDir, [Agent82]), ?line {error, Reason82} = config_start(Opts), - p("start failed (as expected): ~p", [Reason82]), + ?IPRINT("start failed (as expected): ~p", [Reason82]), ?line {failed_check, _, _, _, {invalid_timer, _}} = Reason82, await_config_not_running(), %% -- - p("[test 83] write agents config file with invalid timeout (3)"), + ?IPRINT("[test 83] write agents config file with invalid timeout (3)"), Agent83 = setelement(7, Agent0, "{1000, 1, 10, kalle}"), write_agents_conf(ConfDir, [Agent83]), ?line {error, Reason83} = config_start(Opts), - p("start failed (as expected): ~p", [Reason83]), + ?IPRINT("start failed (as expected): ~p", [Reason83]), ?line {failed_check, _, _, _, {invalid_timer, _}} = Reason83, await_config_not_running(), %% -- - p("[test 84] write agents config file with invalid timeout (4)"), + ?IPRINT("[test 84] write agents config file with invalid timeout (4)"), Agent84 = setelement(7, Agent0, "{1000, -1, 10, 10}"), write_agents_conf(ConfDir, [Agent84]), ?line {error, Reason84} = config_start(Opts), - p("start failed (as expected): ~p", [Reason84]), + ?IPRINT("start failed (as expected): ~p", [Reason84]), ?line {failed_check, _, _, _, {invalid_timer, _}} = Reason84, await_config_not_running(), %% -- - p("[test 85] write agents config file with invalid timeout (5)"), + ?IPRINT("[test 85] write agents config file with invalid timeout (5)"), Agent85 = setelement(7, Agent0, "{1000, 1, -100, 10}"), write_agents_conf(ConfDir, [Agent85]), ?line {error, Reason85} = config_start(Opts), - p("start failed (as expected): ~p", [Reason85]), + ?IPRINT("start failed (as expected): ~p", [Reason85]), ?line {failed_check, _, _, _, {invalid_timer, _}} = Reason85, await_config_not_running(), %% -- - p("[test 86] write agents config file with invalid timeout (6)"), + ?IPRINT("[test 86] write agents config file with invalid timeout (6)"), Agent86 = setelement(7, Agent0, "{1000, 1, 100, -1}"), write_agents_conf(ConfDir, [Agent86]), ?line {error, Reason86} = config_start(Opts), - p("start failed (as expected): ~p", [Reason86]), + ?IPRINT("start failed (as expected): ~p", [Reason86]), ?line {failed_check, _, _, _, {invalid_timer, _}} = Reason86, await_config_not_running(), %% -- - p("[test 91] write agents config file with invalid max-message-size (1)"), + ?IPRINT("[test 91] write agents config file with invalid max-message-size (1)"), Agent91 = setelement(8, Agent0, "483"), write_agents_conf(ConfDir, [Agent91]), ?line {error, Reason91} = config_start(Opts), - p("start failed (as expected): ~p", [Reason91]), + ?IPRINT("start failed (as expected): ~p", [Reason91]), ?line {failed_check, _, _, _, {invalid_packet_size, _}} = Reason91, await_config_not_running(), %% -- - p("[test 92] write agents config file with invalid max-message-size (2)"), + ?IPRINT("[test 92] write agents config file with invalid max-message-size (2)"), Agent92 = setelement(8, Agent0, "kalle_anka"), write_agents_conf(ConfDir, [Agent92]), ?line {error, Reason92} = config_start(Opts), - p("start failed (as expected): ~p", [Reason92]), + ?IPRINT("start failed (as expected): ~p", [Reason92]), ?line {failed_check, _, _, _, {invalid_packet_size, _}} = Reason92, await_config_not_running(), %% -- - p("[test A1] write agents config file with invalid version (1)"), + ?IPRINT("[test A1] write agents config file with invalid version (1)"), AgentA1 = setelement(9, Agent0, "1"), write_agents_conf(ConfDir, [AgentA1]), ?line {error, ReasonA1} = config_start(Opts), - p("start failed (as expected): ~p", [ReasonA1]), + ?IPRINT("start failed (as expected): ~p", [ReasonA1]), ?line {failed_check, _, _, _, {bad_version, _}} = ReasonA1, await_config_not_running(), %% -- - p("[test A2] write agents config file with invalid version (2)"), + ?IPRINT("[test A2] write agents config file with invalid version (2)"), AgentA2 = setelement(9, Agent0, "v30"), write_agents_conf(ConfDir, [AgentA2]), ?line {error, ReasonA2} = config_start(Opts), - p("start failed (as expected): ~p", [ReasonA2]), + ?IPRINT("start failed (as expected): ~p", [ReasonA2]), ?line {failed_check, _, _, _, {bad_version, _}} = ReasonA2, await_config_not_running(), %% -- - p("[test B1] write agents config file with invalid sec-model (1)"), + ?IPRINT("[test B1] write agents config file with invalid sec-model (1)"), AgentB1 = setelement(10, Agent0, "\"any\""), write_agents_conf(ConfDir, [AgentB1]), ?line {error, ReasonB1} = config_start(Opts), - p("start failed (as expected): ~p", [ReasonB1]), + ?IPRINT("start failed (as expected): ~p", [ReasonB1]), ?line {failed_check, _, _, _, {invalid_sec_model, _}} = ReasonB1, await_config_not_running(), %% -- - p("[test B2] write agents config file with invalid sec-model (2)"), + ?IPRINT("[test B2] write agents config file with invalid sec-model (2)"), AgentB2 = setelement(10, Agent0, "v3"), write_agents_conf(ConfDir, [AgentB2]), ?line {error, ReasonB2} = config_start(Opts), - p("start failed (as expected): ~p", [ReasonB2]), + ?IPRINT("start failed (as expected): ~p", [ReasonB2]), ?line {failed_check, _, _, _, {invalid_sec_model, _}} = ReasonB2, await_config_not_running(), %% -- - p("[test C1] write agents config file with invalid sec-name (1)"), + ?IPRINT("[test C1] write agents config file with invalid sec-name (1)"), AgentC1 = setelement(11, Agent0, "initial"), write_agents_conf(ConfDir, [AgentC1]), case config_start(Opts) of {error, ReasonC1} -> - p("start failed (as expected): ~p", [ReasonC1]), + ?IPRINT("start failed (as expected): ~p", [ReasonC1]), ?line {failed_check, _, _, _, {bad_sec_name, _}} = ReasonC1, await_config_not_running(); OK_C1 -> @@ -1327,12 +1362,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test C2] write agents config file with invalid sec-name (2)"), + ?IPRINT("[test C2] write agents config file with invalid sec-name (2)"), AgentC2 = setelement(11, Agent0, "10101"), write_agents_conf(ConfDir, [AgentC2]), case config_start(Opts) of {error, ReasonC2} -> - p("start failed (as expected): ~p", [ReasonC2]), + ?IPRINT("start failed (as expected): ~p", [ReasonC2]), ?line {failed_check, _, _, _, {bad_sec_name, _}} = ReasonC2, await_config_not_running(); OK_C2 -> @@ -1340,12 +1375,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test D1] write agents config file with invalid sec-level (1)"), + ?IPRINT("[test D1] write agents config file with invalid sec-level (1)"), AgentD1 = setelement(12, Agent0, "\"noAuthNoPriv\""), write_agents_conf(ConfDir, [AgentD1]), case config_start(Opts) of {error, ReasonD1} -> - p("start failed (as expected): ~p", [ReasonD1]), + ?IPRINT("start failed (as expected): ~p", [ReasonD1]), ?line {failed_check, _, _, _, {invalid_sec_level, _}} = ReasonD1, await_config_not_running(); OK_D1 -> @@ -1353,12 +1388,12 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test D2] write agents config file with invalid sec-level (2)"), + ?IPRINT("[test D2] write agents config file with invalid sec-level (2)"), AgentD2 = setelement(12, Agent0, "99"), write_agents_conf(ConfDir, [AgentD2]), case config_start(Opts) of {error, ReasonD2} -> - p("start failed (as expected): ~p", [ReasonD2]), + ?IPRINT("start failed (as expected): ~p", [ReasonD2]), ?line {failed_check, _, _, _, {invalid_sec_level, _}} = ReasonD2, await_config_not_running(); OK_D2 -> @@ -1366,18 +1401,18 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> end, %% -- - p("[test E1] write agents config file with invalid agent (1)"), + ?IPRINT("[test E1] write agents config file with invalid agent (1)"), write_agents_conf2(ConfDir, "{swiacf, \"targ-hobbes\"}."), case config_start(Opts) of {error, ReasonE1} -> - p("start failed (as expected): ~p", [ReasonE1]), + ?IPRINT("start failed (as expected): ~p", [ReasonE1]), ?line {failed_check, _, _, _, {bad_agent_config, _}} = ReasonE1, await_config_not_running(); OK_E1 -> exit({error, {unexpected_success, "E1", OK_E1}}) end, - p("done"), + ?IPRINT("done"), ok. @@ -1389,8 +1424,8 @@ start_with_invalid_usm_conf_file1(suite) -> []; start_with_invalid_usm_conf_file1(doc) -> "Start with invalid usm config file."; start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) -> - put(tname,swiusmcf), - p("start"), + put(tname, "START-W-INV-USM-CONF-FILE-1"), + ?IPRINT("start"), process_flag(trap_exit, true), case ?CRYPTO_START() of @@ -1424,177 +1459,177 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) -> "usmNoPrivProtocol", "[]"}, %% -- - p("[test 11] write usm config file with invalid engine-id (1)"), + ?IPRINT("[test 11] write usm config file with invalid engine-id (1)"), Usm11 = setelement(1, Usm0, "kalle-anka"), write_usm_conf(ConfDir, [Usm11]), ?line {error, Reason11} = config_start(Opts), - p("start failed (as expected): ~p", [Reason11]), + ?IPRINT("start failed (as expected): ~p", [Reason11]), ?line {failed_reading, _, _, _, {parse_error, _}} = Reason11, await_config_not_running(), %% -- - p("[test 12] write usm config file with invalid engine-id (2)"), + ?IPRINT("[test 12] write usm config file with invalid engine-id (2)"), Usm12 = setelement(1, Usm0, "kalle_anka"), write_usm_conf(ConfDir, [Usm12]), ?line {error, Reason12} = config_start(Opts), - p("start failed (as expected): ~p", [Reason12]), + ?IPRINT("start failed (as expected): ~p", [Reason12]), ?line {failed_check, _, _, _, {bad_usm_engine_id, _}} = Reason12, await_config_not_running(), %% -- - p("[test 13] write usm config file with invalid engine-id (3)"), + ?IPRINT("[test 13] write usm config file with invalid engine-id (3)"), Usm13 = setelement(1, Usm1, "10101"), write_usm_conf(ConfDir, [Usm13]), ?line {error, Reason13} = config_start(Opts), - p("start failed (as expected): ~p", [Reason13]), + ?IPRINT("start failed (as expected): ~p", [Reason13]), ?line {failed_check, _, _, _, {bad_usm_engine_id, _}} = Reason13, await_config_not_running(), %% -- - p("[test 21] write usm config file with invalid user-name (1)"), + ?IPRINT("[test 21] write usm config file with invalid user-name (1)"), Usm21 = setelement(2, Usm0, "kalle_anka"), write_usm_conf(ConfDir, [Usm21]), ?line {error, Reason21} = config_start(Opts), - p("start failed (as expected): ~p", [Reason21]), + ?IPRINT("start failed (as expected): ~p", [Reason21]), ?line {failed_check, _, _, _, {bad_usm_user_name, _}} = Reason21, await_config_not_running(), %% -- - p("[test 22] write usm config file with invalid user-name (1)"), + ?IPRINT("[test 22] write usm config file with invalid user-name (1)"), Usm22 = setelement(2, Usm1, "10101"), write_usm_conf(ConfDir, [Usm22]), ?line {error, Reason22} = config_start(Opts), - p("start failed (as expected): ~p", [Reason22]), + ?IPRINT("start failed (as expected): ~p", [Reason22]), ?line {failed_check, _, _, _, {bad_usm_user_name, _}} = Reason22, await_config_not_running(), %% -- - p("[test 31] write usm config file with invalid sec-name (1)"), + ?IPRINT("[test 31] write usm config file with invalid sec-name (1)"), Usm31 = setelement(3, Usm1, "kalle_anka"), write_usm_conf(ConfDir, [Usm31]), ?line {error, Reason31} = config_start(Opts), - p("start failed (as expected): ~p", [Reason31]), + ?IPRINT("start failed (as expected): ~p", [Reason31]), ?line {failed_check, _, _, _, {bad_usm_sec_name, _}} = Reason31, await_config_not_running(), %% -- - p("[test 32] write usm config file with invalid sec-name (2)"), + ?IPRINT("[test 32] write usm config file with invalid sec-name (2)"), Usm32 = setelement(3, Usm1, "10101"), write_usm_conf(ConfDir, [Usm32]), ?line {error, Reason32} = config_start(Opts), - p("start failed (as expected): ~p", [Reason32]), + ?IPRINT("start failed (as expected): ~p", [Reason32]), ?line {failed_check, _, _, _, {bad_usm_sec_name, _}} = Reason32, await_config_not_running(), %% -- - p("[test 41] write usm config file with invalid auth-protocol (1)"), + ?IPRINT("[test 41] write usm config file with invalid auth-protocol (1)"), Usm41 = setelement(3, Usm0, "\"usmNoAuthProtocol\""), write_usm_conf(ConfDir, [Usm41]), ?line {error, Reason41} = config_start(Opts), - p("start failed (as expected): ~p", [Reason41]), + ?IPRINT("start failed (as expected): ~p", [Reason41]), ?line {failed_check, _, _, _, {invalid_auth_protocol, _}} = Reason41, await_config_not_running(), %% -- - p("[test 42] write usm config file with invalid auth-protocol (2)"), + ?IPRINT("[test 42] write usm config file with invalid auth-protocol (2)"), Usm42 = setelement(3, Usm0, "kalle"), write_usm_conf(ConfDir, [Usm42]), ?line {error, Reason42} = config_start(Opts), - p("start failed (as expected): ~p", [Reason42]), + ?IPRINT("start failed (as expected): ~p", [Reason42]), ?line {failed_check, _, _, _, {invalid_auth_protocol, _}} = Reason42, await_config_not_running(), %% -- - p("[test 43] write usm config file with invalid auth-protocol (3)"), + ?IPRINT("[test 43] write usm config file with invalid auth-protocol (3)"), Usm43 = setelement(3, Usm0, "10101"), write_usm_conf(ConfDir, [Usm43]), ?line {error, Reason43} = config_start(Opts), - p("start failed (as expected): ~p", [Reason43]), + ?IPRINT("start failed (as expected): ~p", [Reason43]), ?line {failed_check, _, _, _, {invalid_auth_protocol, _}} = Reason43, await_config_not_running(), %% -- - p("[test 51] write usm config file with invalid auth-key (1)"), + ?IPRINT("[test 51] write usm config file with invalid auth-key (1)"), Usm51 = setelement(3, Usm0, "usmHMACMD5AuthProtocol"), write_usm_conf(ConfDir, [Usm51]), ?line {error, Reason51} = config_start(Opts), - p("start failed (as expected): ~p", [Reason51]), + ?IPRINT("start failed (as expected): ~p", [Reason51]), ?line {failed_check, _, _, _, {invalid_auth_key, _, _}} = Reason51, await_config_not_running(), %% -- - p("[test 52] write usm config file with invalid auth-key (2)"), + ?IPRINT("[test 52] write usm config file with invalid auth-key (2)"), Usm52 = setelement(4, Usm51, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5]"), write_usm_conf(ConfDir, [Usm52]), ?line {error, Reason52} = config_start(Opts), - p("start failed (as expected): ~p", [Reason52]), + ?IPRINT("start failed (as expected): ~p", [Reason52]), ?line {failed_check, _, _, _, {invalid_auth_key, _, 15}} = Reason52, await_config_not_running(), %% -- - p("[test 53] write usm config file with invalid auth-key (3)"), + ?IPRINT("[test 53] write usm config file with invalid auth-key (3)"), Usm53 = setelement(4, Usm51, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7]"), write_usm_conf(ConfDir, [Usm53]), ?line {error, Reason53} = config_start(Opts), - p("start failed (as expected): ~p", [Reason53]), + ?IPRINT("start failed (as expected): ~p", [Reason53]), ?line {failed_check, _, _, _, {invalid_auth_key, _, 17}} = Reason53, await_config_not_running(), %% -- - p("[test 54] write usm config file with invalid auth-key (4)"), + ?IPRINT("[test 54] write usm config file with invalid auth-key (4)"), Usm54 = setelement(4, Usm51, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,kalle]"), write_usm_conf(ConfDir, [Usm54]), ?line maybe_start_crypto(), %% Make sure it's started... ?line {error, Reason54} = config_start(Opts), ?line ok = maybe_stop_crypto(), - p("start failed (as expected): ~p", [Reason54]), + ?IPRINT("start failed (as expected): ~p", [Reason54]), ?line {failed_check, _, _, _, {invalid_auth_key, _}} = Reason54, await_config_not_running(), %% -- - p("[test 55] write usm config file with invalid auth-key (5)"), + ?IPRINT("[test 55] write usm config file with invalid auth-key (5)"), Usm55 = setelement(4, Usm51, "arne_anka"), write_usm_conf(ConfDir, [Usm55]), ?line {error, Reason55} = config_start(Opts), - p("start failed (as expected): ~p", [Reason55]), + ?IPRINT("start failed (as expected): ~p", [Reason55]), ?line {failed_check, _, _, _, {invalid_auth_key, _}} = Reason55, await_config_not_running(), %% -- - p("[test 56] write usm config file with invalid auth-key (6)"), + ?IPRINT("[test 56] write usm config file with invalid auth-key (6)"), Usm56 = setelement(4, Usm51, "10101"), write_usm_conf(ConfDir, [Usm56]), ?line {error, Reason56} = config_start(Opts), - p("start failed (as expected): ~p", [Reason56]), + ?IPRINT("start failed (as expected): ~p", [Reason56]), ?line {failed_check, _, _, _, {invalid_auth_key, _}} = Reason56, await_config_not_running(), %% -- - p("[test 57] write usm config file with invalid auth-key (7)"), + ?IPRINT("[test 57] write usm config file with invalid auth-key (7)"), Usm57 = setelement(3, Usm0, "usmHMACSHAAuthProtocol"), write_usm_conf(ConfDir, [Usm57]), ?line {error, Reason57} = config_start(Opts), - p("start failed (as expected): ~p", [Reason57]), + ?IPRINT("start failed (as expected): ~p", [Reason57]), ?line {failed_check, _, _, _, {invalid_auth_key, _, _}} = Reason57, await_config_not_running(), %% -- - p("[test 58] write usm config file with invalid auth-key (8)"), + ?IPRINT("[test 58] write usm config file with invalid auth-key (8)"), Usm58 = setelement(4, Usm57, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6]"), write_usm_conf(ConfDir, [Usm58]), ?line {error, Reason58} = config_start(Opts), - p("start failed (as expected): ~p", [Reason58]), + ?IPRINT("start failed (as expected): ~p", [Reason58]), ?line {failed_check, _, _, _, {invalid_auth_key, _, 16}} = Reason58, await_config_not_running(), %% -- - p("[test 59] write usm config file with invalid auth-key (9)"), + ?IPRINT("[test 59] write usm config file with invalid auth-key (9)"), Usm59 = setelement(4, Usm57, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,ka]"), write_usm_conf(ConfDir, [Usm59]), ?line ok = maybe_start_crypto(), ?line {error, Reason59} = config_start(Opts), ?line ok = maybe_stop_crypto(), - p("start failed (as expected): ~p", [Reason59]), + ?IPRINT("start failed (as expected): ~p", [Reason59]), ?line {failed_check, _, _, _, {invalid_auth_key, _}} = Reason59, await_config_not_running(), @@ -1604,14 +1639,14 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) -> %% explicitly (all of it is as of R14 implemented with NIFs). case (catch crypto:version()) of {'EXIT', {undef, _}} -> - p("[test 5A] write usm config file with valid auth-key " + ?IPRINT("[test 5A] write usm config file with valid auth-key " "when crypto not started (10)"), Usm5A = setelement(4, Usm57, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]"), write_usm_conf(ConfDir, [Usm5A]), ?line {error, Reason5A} = config_start(Opts), - p("start failed (as expected): ~p", [Reason5A]), + ?IPRINT("start failed (as expected): ~p", [Reason5A]), ?line {failed_check, _, _, _, {unsupported_crypto, _}} = Reason5A, await_config_not_running(); _ -> @@ -1622,85 +1657,85 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) -> %% </CRYPTO-MODIFICATIONS> %% -- - p("[test 61] write usm config file with invalid priv-protocol (1)"), + ?IPRINT("[test 61] write usm config file with invalid priv-protocol (1)"), Usm61 = setelement(5, Usm0, "\"usmNoPrivProtocol\""), write_usm_conf(ConfDir, [Usm61]), ?line {error, Reason61} = config_start(Opts), - p("start failed (as expected): ~p", [Reason61]), + ?IPRINT("start failed (as expected): ~p", [Reason61]), ?line {failed_check, _, _, _, {invalid_priv_protocol, _}} = Reason61, await_config_not_running(), %% -- - p("[test 62] write usm config file with invalid priv-protocol (2)"), + ?IPRINT("[test 62] write usm config file with invalid priv-protocol (2)"), Usm62 = setelement(5, Usm0, "kalle"), write_usm_conf(ConfDir, [Usm62]), ?line {error, Reason62} = config_start(Opts), - p("start failed (as expected): ~p", [Reason62]), + ?IPRINT("start failed (as expected): ~p", [Reason62]), ?line {failed_check, _, _, _, {invalid_priv_protocol, _}} = Reason62, await_config_not_running(), %% -- - p("[test 63] write usm config file with invalid priv-protocol (3)"), + ?IPRINT("[test 63] write usm config file with invalid priv-protocol (3)"), Usm63 = setelement(5, Usm0, "10101"), write_usm_conf(ConfDir, [Usm63]), ?line {error, Reason63} = config_start(Opts), - p("start failed (as expected): ~p", [Reason63]), + ?IPRINT("start failed (as expected): ~p", [Reason63]), ?line {failed_check, _, _, _, {invalid_priv_protocol, _}} = Reason63, await_config_not_running(), %% -- - p("[test 71] write usm config file with invalid priv-key (1)"), + ?IPRINT("[test 71] write usm config file with invalid priv-key (1)"), Usm71 = setelement(5, Usm0, "usmDESPrivProtocol"), write_usm_conf(ConfDir, [Usm71]), ?line {error, Reason71} = config_start(Opts), - p("start failed (as expected): ~p", [Reason71]), + ?IPRINT("start failed (as expected): ~p", [Reason71]), ?line {failed_check, _, _, _, {invalid_priv_key, _, _}} = Reason71, await_config_not_running(), %% -- - p("[test 72] write usm config file with invalid priv-key (2)"), + ?IPRINT("[test 72] write usm config file with invalid priv-key (2)"), Usm72 = setelement(6, Usm71, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5]"), write_usm_conf(ConfDir, [Usm72]), ?line {error, Reason72} = config_start(Opts), - p("start failed (as expected): ~p", [Reason72]), + ?IPRINT("start failed (as expected): ~p", [Reason72]), ?line {failed_check, _, _, _, {invalid_priv_key, _, 15}} = Reason72, await_config_not_running(), %% -- - p("[test 73] write usm config file with invalid priv-key (3)"), + ?IPRINT("[test 73] write usm config file with invalid priv-key (3)"), Usm73 = setelement(6, Usm71, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7]"), write_usm_conf(ConfDir, [Usm73]), ?line {error, Reason73} = config_start(Opts), - p("start failed (as expected): ~p", [Reason73]), + ?IPRINT("start failed (as expected): ~p", [Reason73]), ?line {failed_check, _, _, _, {invalid_priv_key, _, 17}} = Reason73, await_config_not_running(), %% -- - p("[test 74] write usm config file with invalid priv-key (4)"), + ?IPRINT("[test 74] write usm config file with invalid priv-key (4)"), Usm74 = setelement(6, Usm71, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,kalle]"), write_usm_conf(ConfDir, [Usm74]), ?line ok = maybe_start_crypto(), ?line {error, Reason74} = config_start(Opts), ?line ok = maybe_stop_crypto(), - p("start failed (as expected): ~p", [Reason74]), + ?IPRINT("start failed (as expected): ~p", [Reason74]), ?line {failed_check, _, _, _, {invalid_priv_key, _}} = Reason74, await_config_not_running(), %% -- - p("[test 75] write usm config file with invalid priv-key (5)"), + ?IPRINT("[test 75] write usm config file with invalid priv-key (5)"), Usm75 = setelement(6, Usm71, "arne_anka"), write_usm_conf(ConfDir, [Usm75]), ?line {error, Reason75} = config_start(Opts), - p("start failed (as expected): ~p", [Reason75]), + ?IPRINT("start failed (as expected): ~p", [Reason75]), ?line {failed_check, _, _, _, {invalid_priv_key, _}} = Reason75, await_config_not_running(), %% -- - p("[test 76] write usm config file with invalid priv-key (6)"), + ?IPRINT("[test 76] write usm config file with invalid priv-key (6)"), Usm76 = setelement(6, Usm71, "10101"), write_usm_conf(ConfDir, [Usm76]), ?line {error, Reason76} = config_start(Opts), - p("start failed (as expected): ~p", [Reason76]), + ?IPRINT("start failed (as expected): ~p", [Reason76]), ?line {failed_check, _, _, _, {invalid_priv_key, _}} = Reason76, await_config_not_running(), @@ -1710,12 +1745,12 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) -> %% explicitly (all of it is as of R14 implemented with NIFs). case (catch crypto:version()) of {'EXIT', {undef, _}} -> - p("[test 77] write usm config file with valid priv-key " + ?IPRINT("[test 77] write usm config file with valid priv-key " "when crypto not started (7)"), Usm77 = setelement(6, Usm71, "[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6]"), write_usm_conf(ConfDir, [Usm77]), ?line {error, Reason77} = config_start(Opts), - p("start failed (as expected): ~p", [Reason77]), + ?IPRINT("start failed (as expected): ~p", [Reason77]), ?line {failed_check, _, _, _, {unsupported_crypto, _}} = Reason77, await_config_not_running(); _ -> @@ -1726,14 +1761,14 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) -> %% </CRYPTO-MODIFICATIONS> %% -- - p("[test 78] write usm config file with invalid usm (1)"), + ?IPRINT("[test 78] write usm config file with invalid usm (1)"), write_usm_conf2(ConfDir, "{\"bmkEngine\", \"swiusmcf\"}."), ?line {error, Reason81} = config_start(Opts), - p("start failed (as expected): ~p", [Reason81]), + ?IPRINT("start failed (as expected): ~p", [Reason81]), ?line {failed_check, _, _, _, {bad_usm_config, _}} = Reason81, await_config_not_running(), - p("done"), + ?IPRINT("done"), ok. @@ -1746,28 +1781,28 @@ start_with_create_db_and_dir_opt(doc) -> "Start the snmp manager config process with the\n" "create_db_and_dir option."; start_with_create_db_and_dir_opt(Conf) when is_list(Conf) -> - put(tname, swcdado), - p("start"), + put(tname, "START-W-CRE-DB-AND-DIR-OPT"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), true = not filelib:is_dir(DbDir) and not filelib:is_file(DbDir), write_manager_conf(ConfDir), - p("verify nonexistent db_dir"), + ?IPRINT("verify nonexistent db_dir"), ConfigOpts01 = [{verbosity,trace}, {dir, ConfDir}, {db_dir, DbDir}], {error, Reason01} = config_start([{config, ConfigOpts01}]), - p("nonexistent db_dir res: ~p", [Reason01]), + ?IPRINT("nonexistent db_dir res: ~p", [Reason01]), {invalid_conf_db_dir, _, not_found} = Reason01, - p("verify nonexistent db_dir gets created"), + ?IPRINT("verify nonexistent db_dir gets created"), ConfigOpts02 = [{db_init_error, create_db_and_dir} | ConfigOpts01], {ok, _Pid} = config_start([{config, ConfigOpts02}]), true = filelib:is_dir(DbDir), - p("verified: nonexistent db_dir was correctly created"), + ?IPRINT("verified: nonexistent db_dir was correctly created"), ok = config_stop(), - p("done"), + ?IPRINT("done"), ok. %% @@ -1780,8 +1815,8 @@ simple_system_op(doc) -> "Access some of the known system info and some \n" "system info that does not exist."; simple_system_op(Conf) when is_list(Conf) -> - put(tname,sso), - p("start"), + put(tname, "SIMPLE-SYS-OP"), + ?IPRINT("start"), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -1790,21 +1825,21 @@ simple_system_op(Conf) when is_list(Conf) -> Opts = [{versions, [v1]}, {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}], - p("start config"), + ?IPRINT("start config"), ?line {ok, _Pid} = config_start(Opts), - p("retreive various configs"), + ?IPRINT("retreive various configs"), ?line {ok, _Time} = snmpm_config:system_start_time(), ?line {ok, _EngineId} = snmpm_config:get_engine_id(), ?line {ok, _MMS} = snmpm_config:get_engine_max_message_size(), - p("attempt to retreive nonexisting"), + ?IPRINT("attempt to retreive nonexisting"), ?line {error, not_found} = snmpm_config:system_info(kalle), ?line ok = config_stop(), await_config_not_running(), - p("done"), + ?IPRINT("done"), ok. @@ -1822,8 +1857,8 @@ register_user_using_file(suite) -> []; register_user_using_file(doc) -> "Register user using the 'users.conf' file."; register_user_using_file(Conf) when is_list(Conf) -> - put(tname,ruufi), - p("start"), + put(tname, "REG-USER-USING-FILE"), + ?IPRINT("start"), process_flag(trap_exit, true), _ConfDir = ?config(manager_conf_dir, Conf), _DbDir = ?config(manager_db_dir, Conf), @@ -1838,8 +1873,8 @@ register_user_using_function(suite) -> []; register_user_using_function(doc) -> "Register user using the API (function)."; register_user_using_function(Conf) when is_list(Conf) -> - put(tname,ruufu), - p("start"), + put(tname, "REG-USER-USING-FUNC"), + ?IPRINT("start"), process_flag(trap_exit, true), _ConfDir = ?config(manager_conf_dir, Conf), _DbDir = ?config(manager_db_dir, Conf), @@ -1854,8 +1889,8 @@ register_user_failed_using_function1(suite) -> []; register_user_failed_using_function1(doc) -> "Register user failed using incorrect arguments to API (function)."; register_user_failed_using_function1(Conf) when is_list(Conf) -> - put(tname,rufufu1), - p("start"), + put(tname, "REG-USER-FAIL-USING-FUNC-1"), + ?IPRINT("start"), process_flag(trap_exit, true), _ConfDir = ?config(manager_conf_dir, Conf), _DbDir = ?config(manager_db_dir, Conf), @@ -1876,8 +1911,9 @@ register_agent_using_file(suite) -> []; register_agent_using_file(doc) -> "Register agents using the 'agents'conf' file."; register_agent_using_file(Conf) when is_list(Conf) -> + put(tname, "REG-AG-USING-FILE"), put(tname,raufi), - p("start"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), DbDir = ?config(manager_db_dir, Conf), @@ -1887,11 +1923,11 @@ register_agent_using_file(Conf) when is_list(Conf) -> %% -- - p("write manager config file"), + ?IPRINT("write manager config file"), write_manager_conf(ConfDir), %% -- - p("write users config file"), + ?IPRINT("write users config file"), UserId1 = raufi1, UserId1Str = str(UserId1), UserId2 = raufi2, @@ -1901,7 +1937,7 @@ register_agent_using_file(Conf) when is_list(Conf) -> write_users_conf(ConfDir, [User1, User2]), %% -- - p("write agents config file"), + ?IPRINT("write agents config file"), AgentAddr1 = [192,168,0,101], AgentAddr1Str = str(AgentAddr1), AgentPort1 = 162, @@ -1929,38 +1965,38 @@ register_agent_using_file(Conf) when is_list(Conf) -> write_agents_conf(ConfDir, [Agent1Str, Agent2Str]), %% -- - p("start the config process"), + ?IPRINT("start the config process"), ?line {ok, _Pid} = config_start(Opts), %% -- - p("which agents"), + ?IPRINT("which agents"), ?line [_, _] = All = snmpm_config:which_agents(), - p("all agents: ~n ~p", [All]), + ?IPRINT("all agents: ~n ~p", [All]), ?line [A1] = snmpm_config:which_agents(UserId1), - p("agents belonging to ~w: ~n ~p", [UserId1, A1]), + ?IPRINT("agents belonging to ~w: ~n ~p", [UserId1, A1]), ?line [A2] = snmpm_config:which_agents(UserId2), - p("agents belonging to ~w: ~n ~p", [UserId2, A2]), + ?IPRINT("agents belonging to ~w: ~n ~p", [UserId2, A2]), %% -- - p("All info for agent <~w,~w>", [AgentAddr1, AgentPort1]), + ?IPRINT("All info for agent <~w,~w>", [AgentAddr1, AgentPort1]), ?line {ok, AllInfo1} = snmpm_config:agent_info(AgentAddr1, AgentPort1, all), - p("all agent info for agent: ~n ~p", [AllInfo1]), + ?IPRINT("all agent info for agent: ~n ~p", [AllInfo1]), %% -- - p("EngineID (~p) for agent <~w,~w>", [EngineID1, AgentAddr1, AgentPort1]), + ?IPRINT("EngineID (~p) for agent <~w,~w>", [EngineID1, AgentAddr1, AgentPort1]), ?line {ok, EngineID1} = snmpm_config:agent_info(AgentAddr1, AgentPort1, engine_id), %% -- - p("All info for agent <~w,~w>", [AgentAddr2, AgentPort2]), + ?IPRINT("All info for agent <~w,~w>", [AgentAddr2, AgentPort2]), ?line {ok, AllInfo2} = snmpm_config:agent_info(AgentAddr2, AgentPort2, all), - p("all agent info for agent: ~n ~p", [AllInfo2]), + ?IPRINT("all agent info for agent: ~n ~p", [AllInfo2]), %% -- - p("EngineID (~p) for agent <~w,~w>", [EngineID2, AgentAddr2, AgentPort2]), + ?IPRINT("EngineID (~p) for agent <~w,~w>", [EngineID2, AgentAddr2, AgentPort2]), ?line {ok, EngineID2} = snmpm_config:agent_info(AgentAddr2, AgentPort2, engine_id), @@ -1968,7 +2004,7 @@ register_agent_using_file(Conf) when is_list(Conf) -> ?line {ok, MMS2} = snmpm_config:agent_info(AgentAddr2, AgentPort2, max_message_size), NewMMS21 = 2048, - p("try update agent info max-message-size to ~w for agent <~w,~w>", + ?IPRINT("try update agent info max-message-size to ~w for agent <~w,~w>", [NewMMS21, AgentAddr2, AgentPort2]), ?line ok = snmpm_config:update_agent_info(UserId2, AgentAddr2, AgentPort2, max_message_size, NewMMS21), @@ -1976,34 +2012,34 @@ register_agent_using_file(Conf) when is_list(Conf) -> snmpm_config:agent_info(AgentAddr2, AgentPort2, max_message_size), %% -- - p("try (and fail) to update agent info max-message-size to ~w " + ?IPRINT("try (and fail) to update agent info max-message-size to ~w " "for agent <~w,~w> " "with user ~w (not owner)", [NewMMS21, AgentAddr2, AgentPort2, UserId1]), ?line {error, Reason01} = snmpm_config:update_agent_info(UserId1, AgentAddr2, AgentPort2, max_message_size, NewMMS21), - p("expected failure. Reason01: ~p", [Reason01]), + ?IPRINT("expected failure. Reason01: ~p", [Reason01]), ?line {ok, NewMMS21} = snmpm_config:agent_info(AgentAddr2, AgentPort2, max_message_size), %% -- NewMMS22 = 400, - p("try (and fail) to update agent info max-message-size to ~w " + ?IPRINT("try (and fail) to update agent info max-message-size to ~w " "for agent <~w,~w>", [NewMMS22, AgentAddr2, AgentPort2]), ?line {error, Reason02} = snmpm_config:update_agent_info(UserId1, AgentAddr2, AgentPort2, max_message_size, NewMMS22), - p("expected failure. Reason02: ~p", [Reason02]), + ?IPRINT("expected failure. Reason02: ~p", [Reason02]), %% -- - p("stop config process"), + ?IPRINT("stop config process"), ?line ok = snmpm_config:stop(), await_config_not_running(), %% -- - p("done"), + ?IPRINT("done"), ok. @@ -2015,8 +2051,8 @@ register_agent_using_function(suite) -> []; register_agent_using_function(doc) -> "Register agents using the API (function)."; register_agent_using_function(Conf) when is_list(Conf) -> - put(tname,raufu), - p("start"), + put(tname, "REG-AG-USING-FUNC"), + ?IPRINT("start"), process_flag(trap_exit, true), _ConfDir = ?config(manager_conf_dir, Conf), _DbDir = ?config(manager_db_dir, Conf), @@ -2032,8 +2068,8 @@ register_agent_failed_using_function1(doc) -> "Register agents failng using the API (function) with incorrect " "config (1)."; register_agent_failed_using_function1(Conf) when is_list(Conf) -> - put(tname,rafuf1), - p("start"), + put(tname, "REG-AG-FAIL-USING-FUNC-1"), + ?IPRINT("start"), process_flag(trap_exit, true), _ConfDir = ?config(manager_conf_dir, Conf), _DbDir = ?config(manager_db_dir, Conf), @@ -2054,8 +2090,8 @@ register_usm_user_using_file(suite) -> []; register_usm_user_using_file(doc) -> "Register usm user using the 'usm.conf' file."; register_usm_user_using_file(Conf) when is_list(Conf) -> - put(tname,ruuufi), - p("start"), + put(tname, "REG-USM-USER-USING-FILE"), + ?IPRINT("start"), process_flag(trap_exit, true), case ?CRYPTO_START() of @@ -2077,11 +2113,11 @@ register_usm_user_using_file(Conf) when is_list(Conf) -> {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}], %% -- - p("write manager config file"), + ?IPRINT("write manager config file"), write_manager_conf(ConfDir), %% -- - p("write usm user config file"), + ?IPRINT("write usm user config file"), SecEngineID = "loctzp's engine", SecName1 = "samu_auth1", UserName1 = SecName1, @@ -2101,31 +2137,31 @@ register_usm_user_using_file(Conf) when is_list(Conf) -> write_usm_conf(ConfDir, [UsmUser1, UsmUser2]), %% -- - p("start the config process"), + ?IPRINT("start the config process"), ?line {ok, _Pid} = config_start(Opts), %% -- - p("lookup 1 (ok)"), + ?IPRINT("lookup 1 (ok)"), ?line {ok, #usm_user{name = UserName1} = User1} = snmpm_config:get_usm_user_from_sec_name(SecEngineID, SecName1), - p("User: ~p", [User1]), + ?IPRINT("User: ~p", [User1]), - p("lookup 2 (ok)"), + ?IPRINT("lookup 2 (ok)"), ?line {ok, #usm_user{name = UserName2} = User2} = snmpm_config:get_usm_user_from_sec_name(SecEngineID, SecName2), - p("User: ~p", [User2]), + ?IPRINT("User: ~p", [User2]), - p("lookup 3 (error)"), + ?IPRINT("lookup 3 (error)"), ?line {error, not_found} = snmpm_config:get_usm_user_from_sec_name(SecEngineID, SecName2 ++ "_1"), %% -- - p("stop config process"), + ?IPRINT("stop config process"), ?line ok = snmpm_config:stop(), await_config_not_running(), %% -- - p("done"), + ?IPRINT("done"), ok. @@ -2137,8 +2173,8 @@ register_usm_user_using_function(suite) -> []; register_usm_user_using_function(doc) -> "Register usm user using the API (function)."; register_usm_user_using_function(Conf) when is_list(Conf) -> - put(tname,ruuufu), - p("start"), + put(tname, "REG-USM-USER-USING-FUNC"), + ?IPRINT("start"), process_flag(trap_exit, true), case ?CRYPTO_START() of @@ -2160,18 +2196,18 @@ register_usm_user_using_function(Conf) when is_list(Conf) -> {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}], %% -- - p("write manager config file"), + ?IPRINT("write manager config file"), write_manager_conf(ConfDir), %% -- - p("start the config process"), + ?IPRINT("start the config process"), ?line {ok, _Pid} = config_start(Opts), %% -- - p("register usm user's"), + ?IPRINT("register usm user's"), EngineID = "loctzp's engine", - p("register user 1 (ok)"), + ?IPRINT("register user 1 (ok)"), UserName1 = "samu_auth1", SecName1 = UserName1, UsmConfig1 = [{sec_name, SecName1}, @@ -2179,11 +2215,11 @@ register_usm_user_using_function(Conf) when is_list(Conf) -> {auth_key, [1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6]}, {priv, usmNoPrivProtocol}], ?line ok = snmpm_config:register_usm_user(EngineID, UserName1, UsmConfig1), - p("try register user 1 again (error)"), + ?IPRINT("try register user 1 again (error)"), ?line {error, {already_registered, EngineID, UserName1}} = snmpm_config:register_usm_user(EngineID, UserName1, UsmConfig1), - p("register user 2 (ok)"), + ?IPRINT("register user 2 (ok)"), UserName2 = "samu_auth2", SecName2 = UserName2, UsmConfig2 = [{auth, usmHMACMD5AuthProtocol}, @@ -2191,7 +2227,7 @@ register_usm_user_using_function(Conf) when is_list(Conf) -> {priv, usmNoPrivProtocol}], ?line ok = snmpm_config:register_usm_user(EngineID, UserName2, UsmConfig2), - p("register user 3 (ok)"), + ?IPRINT("register user 3 (ok)"), UserName3 = "samu3", SecName3 = "samu_auth3", UsmConfig3 = [{sec_name, SecName3}, @@ -2200,32 +2236,32 @@ register_usm_user_using_function(Conf) when is_list(Conf) -> {priv, usmNoPrivProtocol}], ?line ok = snmpm_config:register_usm_user(EngineID, UserName3, UsmConfig3), - p("lookup 1 (ok)"), + ?IPRINT("lookup 1 (ok)"), ?line {ok, #usm_user{name = UserName1} = User1} = snmpm_config:get_usm_user_from_sec_name(EngineID, SecName1), - p("User: ~p", [User1]), + ?IPRINT("User: ~p", [User1]), - p("lookup 2 (ok)"), + ?IPRINT("lookup 2 (ok)"), ?line {ok, #usm_user{name = UserName2} = User2} = snmpm_config:get_usm_user_from_sec_name(EngineID, SecName2), - p("User: ~p", [User2]), + ?IPRINT("User: ~p", [User2]), - p("lookup 3 (ok)"), + ?IPRINT("lookup 3 (ok)"), ?line {ok, #usm_user{name = UserName3} = User3} = snmpm_config:get_usm_user_from_sec_name(EngineID, SecName3), - p("User: ~p", [User3]), + ?IPRINT("User: ~p", [User3]), - p("lookup 4 (error)"), + ?IPRINT("lookup 4 (error)"), ?line {error, not_found} = snmpm_config:get_usm_user_from_sec_name(EngineID, SecName3 ++ "_1"), %% -- - p("stop config process"), + ?IPRINT("stop config process"), ?line ok = snmpm_config:stop(), await_config_not_running(), %% -- - p("done"), + ?IPRINT("done"), ok. @@ -2237,8 +2273,8 @@ register_usm_user_failed_using_function1(suite) -> []; register_usm_user_failed_using_function1(doc) -> "Register usm user failed using incorrect arguments to API (function)."; register_usm_user_failed_using_function1(Conf) when is_list(Conf) -> - put(tname,ruufufu1), - p("start"), + put(tname, "REG-USM-USER-FAIL-USING-FUNC"), + ?IPRINT("start"), process_flag(trap_exit, true), case ?CRYPTO_START() of @@ -2266,8 +2302,8 @@ update_usm_user_info(suite) -> []; update_usm_user_info(doc) -> "Update usm user info."; update_usm_user_info(Conf) when is_list(Conf) -> - put(tname,ruufufu1), - p("start"), + put(tname, "UPD-USM-USER-INFO"), + ?IPRINT("start"), process_flag(trap_exit, true), case ?CRYPTO_START() of @@ -2301,8 +2337,8 @@ create_and_increment(suite) -> []; create_and_increment(doc) -> "Craete and increment counters."; create_and_increment(Conf) when is_list(Conf) -> - put(tname,cai), - p("start"), + put(tname, "CRE-AND-INC"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), @@ -2348,8 +2384,8 @@ stats_create_and_increment(suite) -> []; stats_create_and_increment(doc) -> "Create and increment statistics counters."; stats_create_and_increment(Conf) when is_list(Conf) -> - put(tname,scai), - p("start"), + put(tname, "STATS-CRE-AND-INC"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Conf), @@ -2362,19 +2398,19 @@ stats_create_and_increment(Conf) when is_list(Conf) -> ?line {ok, _Pid} = snmpm_config:start_link(Opts), - p("stats table (1): ~p", [ets:tab2list(snmpm_stats_table)]), + ?IPRINT("stats table (1): ~p", [ets:tab2list(snmpm_stats_table)]), ?line 0 = snmpm_config:maybe_cre_stats_counter(stats1, 0), - p("stats table (2): ~p", [ets:tab2list(snmpm_stats_table)]), + ?IPRINT("stats table (2): ~p", [ets:tab2list(snmpm_stats_table)]), ?line ok = snmpm_config:maybe_cre_stats_counter(stats1, 0), - p("stats table (3): ~p", [ets:tab2list(snmpm_stats_table)]), + ?IPRINT("stats table (3): ~p", [ets:tab2list(snmpm_stats_table)]), ?line 1 = snmpm_config:maybe_cre_stats_counter(stats2, 1), - p("stats table (4): ~p", [ets:tab2list(snmpm_stats_table)]), + ?IPRINT("stats table (4): ~p", [ets:tab2list(snmpm_stats_table)]), ?line 10 = snmpm_config:cre_stats_counter(stats3, 10), - p("stats table (5): ~p", [ets:tab2list(snmpm_stats_table)]), + ?IPRINT("stats table (5): ~p", [ets:tab2list(snmpm_stats_table)]), Stats1Inc = fun() -> snmpm_config:incr_stats_counter(stats1, 1) end, ?line 10 = loop(10, -1, Stats1Inc), - p("stats table (6): ~p", [ets:tab2list(snmpm_stats_table)]), + ?IPRINT("stats table (6): ~p", [ets:tab2list(snmpm_stats_table)]), ?line ok = snmpm_config:reset_stats_counter(stats1), @@ -2403,27 +2439,27 @@ otp_7219(suite) -> otp_7219(doc) -> "Test-case for ticket OTP-7219"; otp_7219(Config) when is_list(Config) -> - put(tname, otp7219), - p("start"), + put(tname, "OTP-7219"), + ?IPRINT("start"), process_flag(trap_exit, true), ConfDir = ?config(manager_conf_dir, Config), DbDir = ?config(manager_db_dir, Config), - p("write manager configuration"), + ?IPRINT("write manager configuration"), write_manager_conf(ConfDir), Opts1 = [{versions, [v1]}, {inform_request_behaviour, user}, {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}], - p("start manager config"), + ?IPRINT("start manager config"), ?line {ok, _Pid1} = snmpm_config:start_link(Opts1), - p("get some manager config"), + ?IPRINT("get some manager config"), {ok, {user, _}} = snmpm_config:system_info(net_if_irb), - p("stop manager config"), + ?IPRINT("stop manager config"), ?line ok = snmpm_config:stop(), await_config_not_running(), @@ -2432,17 +2468,17 @@ otp_7219(Config) when is_list(Config) -> {inform_request_behaviour, {user, IRB_TO}}, {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}], - p("start manager config"), + ?IPRINT("start manager config"), ?line {ok, _Pid2} = snmpm_config:start_link(Opts2), - p("get some manager config"), + ?IPRINT("get some manager config"), {ok, {user, IRB_TO}} = snmpm_config:system_info(net_if_irb), - p("stop manager config"), + ?IPRINT("stop manager config"), ?line ok = snmpm_config:stop(), await_config_not_running(), - p("done"), + ?IPRINT("done"), ok. @@ -2452,8 +2488,8 @@ otp_8395_1(suite) -> []; otp_8395_1(doc) -> "OTP-8395(1)"; otp_8395_1(Conf) when is_list(Conf) -> - put(tname, otp_8395_1), - p("start"), + put(tname, "OTP-8395-1"), + ?IPRINT("start"), process_flag(trap_exit, true), otp8395(Conf, false, ok), ok. @@ -2462,8 +2498,8 @@ otp_8395_2(suite) -> []; otp_8395_2(doc) -> "OTP-8395(2)"; otp_8395_2(Conf) when is_list(Conf) -> - put(tname, otp_8395_2), - p("start"), + put(tname, "OTP-8395-2"), + ?IPRINT("start"), process_flag(trap_exit, true), otp8395(Conf, true, ok), ok. @@ -2472,8 +2508,8 @@ otp_8395_3(suite) -> []; otp_8395_3(doc) -> "OTP-8395(3)"; otp_8395_3(Conf) when is_list(Conf) -> - put(tname, otp_8395_3), - p("start"), + put(tname, "OTP-8395-3"), + ?IPRINT("start"), process_flag(trap_exit, true), otp8395(Conf, gurka, error), ok. @@ -2487,7 +2523,7 @@ otp8395(Conf, SeqNoVal, Expect) -> write_manager_conf(ConfDir), %% Third set of options (no versions): - p("all options"), + ?IPRINT("all options"), NetIfOpts = [{module, snmpm_net_if}, {verbosity, trace}, {options, [{recbuf, 30000}, @@ -2526,7 +2562,7 @@ otp8395(Conf, SeqNoVal, Expect) -> Error when (Expect =:= ok) -> exit({unexpected_failed_starting_config, SeqNoVal, Error}) end, - p("done"), + ?IPRINT("done"), ok. @@ -2534,8 +2570,8 @@ otp_8395_4(suite) -> []; otp_8395_4(doc) -> "OTP-8395(4)"; otp_8395_4(Conf) when is_list(Conf) -> - put(tname, otp_8395_4), - p("start"), + put(tname, "OTP-8395-4"), + ?IPRINT("start"), process_flag(trap_exit, true), snmp:print_version_info(), @@ -2548,7 +2584,7 @@ otp_8395_4(Conf) when is_list(Conf) -> write_manager_conf(ConfDir), %% Third set of options (no versions): - p("all options"), + ?IPRINT("all options"), NetIfOpts = [{module, snmpm_net_if}, {verbosity, trace}, {options, [{recbuf, 30000}, @@ -2595,7 +2631,7 @@ otp_8395_4(Conf) when is_list(Conf) -> ?line ok = config_stop(), - p("done"), + ?IPRINT("done"), ok. @@ -2611,36 +2647,36 @@ await_config_not_running() -> await_not_running(snmpm_config, 5). await_not_running(Name, 0) -> - p("await_not_running -> done waiting for ~w to die - try kill it", [Name]), + ?IPRINT("await_not_running -> done waiting for ~w to die - try kill it", [Name]), %% Ok, we tried it the nice way, now use brute force await_killed(Name, 5); await_not_running(Name, N) when N > 0 -> - p("await_not_running -> is process ~w still running (~w)", [Name, N]), + ?IPRINT("await_not_running -> is process ~w still running (~w)", [Name, N]), case erlang:whereis(Name) of undefined -> - p("await_not_running -> no such (~w) process - sleep some",[Name]), + ?IPRINT("await_not_running -> no such (~w) process - sleep some",[Name]), ?SLEEP(1000), - p("await_not_running -> no such (~w) process - done", [Name]), + ?IPRINT("await_not_running -> no such (~w) process - done", [Name]), ok; Pid when is_pid(Pid) -> - p("~w process still running", [Name]), + ?IPRINT("~w process still running", [Name]), ?SLEEP(500), await_not_running(Name, N-1) end. await_killed(Name, 0) -> - p("await_killed -> could not kill ~w => giving up", [Name]), + ?IPRINT("await_killed -> could not kill ~w => giving up", [Name]), exit({error, {failed_terminating, Name}}); await_killed(Name, N) when N > 0 -> - p("await_killed -> is process ~w still running (~w)", [Name, N]), + ?IPRINT("await_killed -> is process ~w still running (~w)", [Name, N]), case whereis(Name) of undefined -> - p("await_killed -> no such (~w) process - sleep some", [Name]), + ?IPRINT("await_killed -> no such (~w) process - sleep some", [Name]), ?SLEEP(1000), - p("await_killed -> no such (~w) process - done", [Name]), + ?IPRINT("await_killed -> no such (~w) process - done", [Name]), ok; Pid when is_pid(Pid) -> - p("await_killed -> ~w still running - try kill it", [Name]), + ?IPRINT("await_killed -> ~w still running - try kill it", [Name]), exit(Pid, kill), ?SLEEP(1000), await_killed(Name, N-1) @@ -2809,20 +2845,5 @@ verify_dir_existing(DirName, Dir) -> %% ------ str(X) -> - lists:flatten(io_lib:format("~w", [X])). - - -%% ------ - -p(F) -> - p(F, []). - -p(F, A) -> - p(get(tname), F, A). - -p(TName, F, A) -> - io:format("*** [~s] ***" - " ~w -> " ++ F ++ "~n", [formated_timestamp(),TName|A]). + ?F("~w", [X]). -formated_timestamp() -> - snmp_test_lib:formated_timestamp(). |