aboutsummaryrefslogtreecommitdiffstats
path: root/lib/common_test
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-09-21 11:51:41 +0200
committerSiri Hansen <[email protected]>2012-09-21 11:51:41 +0200
commitbe0284d6ae701ce55d066112964a60ef003e6158 (patch)
tree5604f942cd45162205b04b30008b0b41e52a9a97 /lib/common_test
parenta9007fd4a3e1eea2d88c4cc51b2344e24aacf50c (diff)
downloadotp-be0284d6ae701ce55d066112964a60ef003e6158.tar.gz
otp-be0284d6ae701ce55d066112964a60ef003e6158.tar.bz2
otp-be0284d6ae701ce55d066112964a60ef003e6158.zip
[common_test] Moved ct_snmp_SUITE into data dir and run as other ct tests
Diffstat (limited to 'lib/common_test')
-rw-r--r--lib/common_test/test/Makefile1
-rw-r--r--lib/common_test/test/ct_snmp_SUITE.erl219
-rw-r--r--lib/common_test/test/ct_snmp_SUITE_data/snmp.cfg (renamed from lib/common_test/test/snmp.cfg)6
-rw-r--r--lib/common_test/test/ct_snmp_SUITE_data/snmp1_SUITE.erl152
4 files changed, 259 insertions, 119 deletions
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 33f47e3baf..60c5bd4ff5 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -107,7 +107,6 @@ release_tests_spec:
$(INSTALL_DIR) "$(RELSYSDIR)"
$(INSTALL_DATA) $(ERL_FILES) $(COVERFILE) "$(RELSYSDIR)"
$(INSTALL_DATA) common_test.spec "$(RELSYSDIR)"
- $(INSTALL_DATA) snmp.cfg "$(RELSYSDIR)"
chmod -R u+w "$(RELSYSDIR)"
@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
diff --git a/lib/common_test/test/ct_snmp_SUITE.erl b/lib/common_test/test/ct_snmp_SUITE.erl
index 9e4bbedcfb..848752b816 100644
--- a/lib/common_test/test/ct_snmp_SUITE.erl
+++ b/lib/common_test/test/ct_snmp_SUITE.erl
@@ -1,4 +1,4 @@
-%%--------------------------------------------------------------------
+%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 2012. All Rights Reserved.
@@ -16,137 +16,126 @@
%%
%% %CopyrightEnd%
%%
-%%----------------------------------------------------------------------
-%% File: ct_snmp_SUITE.erl
-%%
-%% Description:
-%% This file contains the test cases for the ct_snmp API.
-%%
-%% @author Support
-%% @doc Test of SNMP support in common_test
-%% @end
-%%----------------------------------------------------------------------
-%%----------------------------------------------------------------------
+
+%%%-------------------------------------------------------------------
+%%% File: ct_snmp_SUITE
+%%%
+%%% Description:
+%%% Test ct_snmp module
+%%%
+%%%-------------------------------------------------------------------
-module(ct_snmp_SUITE).
--include_lib("common_test/include/ct.hrl").
--include_lib("snmp/include/STANDARD-MIB.hrl").
--include_lib("snmp/include/snmp_types.hrl").
-compile(export_all).
-%% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+ Config1 = ct_test_support:init_per_suite(Config),
+ Config1.
+
+end_per_suite(Config) ->
+ ct_test_support:end_per_suite(Config).
-%% SNMP user stuff
--behaviour(snmpm_user).
--export([handle_error/3,
- handle_agent/5,
- handle_pdu/4,
- handle_trap/3,
- handle_inform/3,
- handle_report/3]).
+init_per_testcase(TestCase, Config) ->
+ ct_test_support:init_per_testcase(TestCase, Config).
+end_per_testcase(TestCase, Config) ->
+ ct_test_support:end_per_testcase(TestCase, Config).
-suite() ->
- [{require, snmp_mgr_agent, snmp},
- {require, snmp_app_cfg, snmp_app}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
all() ->
- [start_stop,
- {group,get_set}].
+ [
+ default
+ ].
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
-groups() ->
- [{get_set,[get_values,get_next_values,set_values]}].
+%%%-----------------------------------------------------------------
+%%%
+default(Config) when is_list(Config) ->
+ DataDir = ?config(data_dir, Config),
+ Suite = filename:join(DataDir, "snmp1_SUITE"),
+ CfgFile = filename:join(DataDir, "snmp.cfg"),
+ {Opts,ERPid} = setup([{suite,Suite},{config,CfgFile},
+ {label,default}], Config),
-init_per_group(get_set, Config) ->
- ok = ct_snmp:start(Config,snmp_mgr_agent,snmp_app_cfg),
- Config.
+ ok = execute(default, Opts, ERPid, Config).
-end_per_group(get_set, Config) ->
- ok = ct_snmp:stop(Config),
- Config.
-init_per_testcase(_Case, Config) ->
- Dog = test_server:timetrap(?default_timeout),
- [{watchdog, Dog}|Config].
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
-end_per_testcase(_Case, Config) ->
- Dog=?config(watchdog, Config),
- test_server:timetrap_cancel(Dog),
- ok.
+setup(Test, Config) ->
+ Opts0 = ct_test_support:get_opts(Config),
+ Level = ?config(trace_level, Config),
+ EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+ Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+ ERPid = ct_test_support:start_event_receiver(Config),
+ {Opts,ERPid}.
-init_per_suite(Config) ->
- Config.
+execute(Name, Opts, ERPid, Config) ->
+ ok = ct_test_support:run(Opts, Config),
+ Events = ct_test_support:get_events(ERPid, Config),
-end_per_suite(Config) ->
- Config.
-
-break(_Config) ->
- test_server:break(""),
- ok.
-
-start_stop(Config) ->
- ok = ct_snmp:start(Config,snmp_mgr_agent,snmp_app_cfg),
- timer:sleep(1000),
- {snmp,_,_} = lists:keyfind(snmp,1,application:which_applications()),
- [_|_] = filelib:wildcard("*/*.conf",?config(priv_dir,Config)),
-
- ok = ct_snmp:stop(Config),
- timer:sleep(1000),
- false = lists:keyfind(snmp,1,application:which_applications()),
- [] = filelib:wildcard("*/*.conf",?config(priv_dir,Config)),
- ok.
-
-get_values(_Config) ->
- Oids1 = [?sysDescr_instance, ?sysName_instance],
- {noError,_,V1} = ct_snmp:get_values(agent_name,Oids1,snmp_mgr_agent),
- [#varbind{oid=?sysDescr_instance,value="Erlang SNMP agent"},
- #varbind{oid=?sysName_instance,value="ct_test"}] = V1,
- ok.
-
-get_next_values(_Config) ->
- Oids2 = [?system],
- {noError,_,V2} = ct_snmp:get_next_values(agent_name,Oids2,snmp_mgr_agent),
- [#varbind{oid=?sysDescr_instance,value="Erlang SNMP agent"}] = V2,
- ok.
-
-set_values(Config) ->
- Oid3 = ?sysName_instance,
- NewName = "ct_test changed by " ++ atom_to_list(?MODULE),
- VarsAndVals = [{Oid3,s,NewName}],
- {noError,_,_} =
- ct_snmp:set_values(agent_name,VarsAndVals,snmp_mgr_agent,Config),
-
- Oids4 = [?sysName_instance],
- {noError,_,V4} = ct_snmp:get_values(agent_name,Oids4,snmp_mgr_agent),
- [#varbind{oid=?sysName_instance,value=NewName}] = V4,
-
- ok.
+ ct_test_support:log_events(Name,
+ reformat(Events, ?eh),
+ ?config(priv_dir, Config),
+ Opts),
+
+ TestEvents = events_to_check(Name,Config),
+ ct_test_support:verify_events(TestEvents, Events, Config).
+reformat(Events, EH) ->
+ ct_test_support:reformat(Events, EH).
%%%-----------------------------------------------------------------
-%%% SNMP Manager User callback
-handle_error(ReqId, Reason, UserData) ->
- erlang:display({handle_error,ReqId, Reason, UserData}),
- ignore.
-
-handle_agent(Addr, Port, Type, SnmpInfo, UserData) ->
- erlang:display({handle_agent,Addr, Port, Type, SnmpInfo, UserData}),
- ignore.
-
-handle_pdu(TargetName, ReqId, SnmpPduInfo, UserData) ->
- erlang:display({handle_pdu,TargetName, ReqId, SnmpPduInfo, UserData}),
- ignore.
-
-handle_trap(TargetName, SnmpTrapInfo, UserData) ->
- erlang:display({handle_trap,TargetName, SnmpTrapInfo, UserData}),
- ignore.
-
-handle_inform(TargetName, SnmpInformInfo, UserData) ->
- erlang:display({handle_inform,TargetName, SnmpInformInfo, UserData}),
- ignore.
-
-handle_report(TargetName, SnmpReportInfo, UserData) ->
- erlang:display({handle_report,TargetName, SnmpReportInfo, UserData}),
- ignore.
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(_TestName,Config) ->
+ {module,_} = code:load_abs(filename:join(?config(data_dir,Config),
+ snmp1_SUITE)),
+ TCs = get_tcs(),
+ code:purge(snmp1_SUITE),
+ code:delete(snmp1_SUITE),
+
+ OneTest =
+ [{?eh,start_logging,{'DEF','RUNDIR'}}] ++
+ [{?eh,tc_done,{snmp1_SUITE,TC,ok}} || TC <- TCs] ++
+ [{?eh,stop_logging,[]}],
+
+ %% 2 tests (ct:run_test + script_start) is default
+ OneTest ++ OneTest.
+
+
+get_tcs() ->
+ All = snmp1_SUITE:all(),
+ Groups =
+ try snmp1_SUITE:groups()
+ catch error:undef -> []
+ end,
+ flatten_tcs(All,Groups).
+
+flatten_tcs([H|T],Groups) when is_atom(H) ->
+ [H|flatten_tcs(T,Groups)];
+flatten_tcs([{group,Group}|T],Groups) ->
+ TCs = proplists:get_value(Group,Groups),
+ flatten_tcs(TCs ++ T,Groups);
+flatten_tcs([],_) ->
+ [].
diff --git a/lib/common_test/test/snmp.cfg b/lib/common_test/test/ct_snmp_SUITE_data/snmp.cfg
index a96e4db9d8..b0ac0e6a96 100644
--- a/lib/common_test/test/snmp.cfg
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp.cfg
@@ -1,10 +1,10 @@
%% -*- erlang -*-
{snmp, [{start_agent,true},
- {users,[{user_name,[ct_snmp_SUITE,[]]}]},
+ {users,[{user_name,[snmp1_SUITE,[]]}]},
{managed_agents,[{agent_name, [user_name, {127,0,0,1}, 4000,
- [{engine_id,"ct_snmp_SUITE-Engine"},
+ [{engine_id,"ct_snmp-test-engine"},
{version,v2}]]}]},
- {engine_id,"ct_snmp_SUITE-Engine"},
+ {engine_id,"ct_snmp-test-engine"},
{agent_vsns,[v2]}
]}.
{snmp_app,[{manager, [{config, [{verbosity, silence}]},
diff --git a/lib/common_test/test/ct_snmp_SUITE_data/snmp1_SUITE.erl b/lib/common_test/test/ct_snmp_SUITE_data/snmp1_SUITE.erl
new file mode 100644
index 0000000000..dcc5c5378b
--- /dev/null
+++ b/lib/common_test/test/ct_snmp_SUITE_data/snmp1_SUITE.erl
@@ -0,0 +1,152 @@
+%%--------------------------------------------------------------------
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+%%----------------------------------------------------------------------
+%% File: ct_snmp_SUITE.erl
+%%
+%% Description:
+%% This file contains the test cases for the ct_snmp API.
+%%
+%% @author Support
+%% @doc Test of SNMP support in common_test
+%% @end
+%%----------------------------------------------------------------------
+%%----------------------------------------------------------------------
+-module(snmp1_SUITE).
+-include_lib("common_test/include/ct.hrl").
+-include_lib("snmp/include/STANDARD-MIB.hrl").
+-include_lib("snmp/include/snmp_types.hrl").
+
+-compile(export_all).
+
+%% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:minutes(1)).
+
+%% SNMP user stuff
+-behaviour(snmpm_user).
+-export([handle_error/3,
+ handle_agent/5,
+ handle_pdu/4,
+ handle_trap/3,
+ handle_inform/3,
+ handle_report/3]).
+
+
+suite() ->
+ [{require, snmp_mgr_agent, snmp},
+ {require, snmp_app_cfg, snmp_app}].
+
+all() ->
+ [start_stop,
+ {group,get_set}].
+
+
+groups() ->
+ [{get_set,[get_values,get_next_values,set_values]}].
+
+init_per_group(get_set, Config) ->
+ ok = ct_snmp:start(Config,snmp_mgr_agent,snmp_app_cfg),
+ Config.
+
+end_per_group(get_set, Config) ->
+ ok = ct_snmp:stop(Config),
+ Config.
+
+init_per_testcase(_Case, Config) ->
+ Dog = test_server:timetrap(?default_timeout),
+ [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case, Config) ->
+ Dog=?config(watchdog, Config),
+ test_server:timetrap_cancel(Dog),
+ ok.
+
+init_per_suite(Config) ->
+ Config.
+
+end_per_suite(Config) ->
+ Config.
+
+break(_Config) ->
+ test_server:break(""),
+ ok.
+
+start_stop(Config) ->
+ ok = ct_snmp:start(Config,snmp_mgr_agent,snmp_app_cfg),
+ timer:sleep(1000),
+ {snmp,_,_} = lists:keyfind(snmp,1,application:which_applications()),
+ [_|_] = filelib:wildcard("*/*.conf",?config(priv_dir,Config)),
+
+ ok = ct_snmp:stop(Config),
+ timer:sleep(1000),
+ false = lists:keyfind(snmp,1,application:which_applications()),
+ [] = filelib:wildcard("*/*.conf",?config(priv_dir,Config)),
+ ok.
+
+get_values(_Config) ->
+ Oids1 = [?sysDescr_instance, ?sysName_instance],
+ {noError,_,V1} = ct_snmp:get_values(agent_name,Oids1,snmp_mgr_agent),
+ [#varbind{oid=?sysDescr_instance,value="Erlang SNMP agent"},
+ #varbind{oid=?sysName_instance,value="ct_test"}] = V1,
+ ok.
+
+get_next_values(_Config) ->
+ Oids2 = [?system],
+ {noError,_,V2} = ct_snmp:get_next_values(agent_name,Oids2,snmp_mgr_agent),
+ [#varbind{oid=?sysDescr_instance,value="Erlang SNMP agent"}] = V2,
+ ok.
+
+set_values(Config) ->
+ Oid3 = ?sysName_instance,
+ NewName = "ct_test changed by " ++ atom_to_list(?MODULE),
+ VarsAndVals = [{Oid3,s,NewName}],
+ {noError,_,_} =
+ ct_snmp:set_values(agent_name,VarsAndVals,snmp_mgr_agent,Config),
+
+ Oids4 = [?sysName_instance],
+ {noError,_,V4} = ct_snmp:get_values(agent_name,Oids4,snmp_mgr_agent),
+ [#varbind{oid=?sysName_instance,value=NewName}] = V4,
+
+ ok.
+
+
+%%%-----------------------------------------------------------------
+%%% SNMP Manager User callback
+handle_error(ReqId, Reason, UserData) ->
+ erlang:display({handle_error,ReqId, Reason, UserData}),
+ ignore.
+
+handle_agent(Addr, Port, Type, SnmpInfo, UserData) ->
+ erlang:display({handle_agent,Addr, Port, Type, SnmpInfo, UserData}),
+ ignore.
+
+handle_pdu(TargetName, ReqId, SnmpPduInfo, UserData) ->
+ erlang:display({handle_pdu,TargetName, ReqId, SnmpPduInfo, UserData}),
+ ignore.
+
+handle_trap(TargetName, SnmpTrapInfo, UserData) ->
+ erlang:display({handle_trap,TargetName, SnmpTrapInfo, UserData}),
+ ignore.
+
+handle_inform(TargetName, SnmpInformInfo, UserData) ->
+ erlang:display({handle_inform,TargetName, SnmpInformInfo, UserData}),
+ ignore.
+
+handle_report(TargetName, SnmpReportInfo, UserData) ->
+ erlang:display({handle_report,TargetName, SnmpReportInfo, UserData}),
+ ignore.