aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-10-04 19:03:41 +0200
committerLukas Larsson <[email protected]>2011-02-17 17:16:53 +0100
commite993afa1fb9c7143e09c55dee58aee32e9876d78 (patch)
tree3a3260cff260f14f885847b393b1136bd0e311e8 /lib/snmp
parentd161dc2b44f29f184e60efcd460ed27b1ee0a0e1 (diff)
downloadotp-e993afa1fb9c7143e09c55dee58aee32e9876d78.tar.gz
otp-e993afa1fb9c7143e09c55dee58aee32e9876d78.tar.bz2
otp-e993afa1fb9c7143e09c55dee58aee32e9876d78.zip
Updated test cases to work with ts conversion algorithm
Diffstat (limited to 'lib/snmp')
-rw-r--r--lib/snmp/test/snmp_agent_test.erl8
-rw-r--r--lib/snmp/test/snmp_app_test.erl8
-rw-r--r--lib/snmp/test/snmp_appup_test.erl12
3 files changed, 14 insertions, 14 deletions
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 9d2e9969c4..ba438f0568 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -96,7 +96,7 @@ init_per_testcase(otp8395 = Case, Config) when is_list(Config) ->
?DBG("init_per_testcase -> entry with"
"~n Case: ~p"
"~n Config: ~p", [Case, Config]),
- Config2 = init_per_testcase2(Case, init_suite(Config)),
+ Config2 = init_per_testcase2(Case, init_per_suite(Config)),
otp8395({init, Config2});
init_per_testcase(otp_7157_test = _Case, Config) when is_list(Config) ->
?DBG("init_per_testcase -> entry with"
@@ -134,8 +134,8 @@ fin_per_testcase(_Case, Config) when is_list(Config) ->
Config.
-init_suite(Config) ->
- ?DBG("init_suite -> entry with"
+init_per_suite(Config) ->
+ ?DBG("init_per_suite -> entry with"
"~n Config: ~p", [Config]),
%% Suite root dir for test suite
@@ -170,7 +170,7 @@ init_suite(Config) ->
{mib_dir, MibDir},
{std_mib_dir, StdMibDir} | Config1],
- ?DBG("init_suite -> done when"
+ ?DBG("init_per_suite -> done when"
"~n Config2: ~p", [Config2]),
Config2.
diff --git a/lib/snmp/test/snmp_app_test.erl b/lib/snmp/test/snmp_app_test.erl
index 5c5a5285a0..773f65be46 100644
--- a/lib/snmp/test/snmp_app_test.erl
+++ b/lib/snmp/test/snmp_app_test.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -23,7 +23,7 @@
-module(snmp_app_test).
-export([
- all/1, init_suite/1, fin_suite/1,
+ all/1, init_per_suite/1, fin_suite/1,
init_per_testcase/2, fin_per_testcase/2,
fields/1,
@@ -60,9 +60,9 @@ all(suite) ->
undef_funcs,
start_and_stop
],
- {conf, init_suite, Cases, fin_suite}.
+ {conf, init_per_suite, Cases, fin_suite}.
-init_suite(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
?DISPLAY_SUITE_INFO(),
PrivDir = ?config(priv_dir, Config),
TopDir = filename:join(PrivDir, app),
diff --git a/lib/snmp/test/snmp_appup_test.erl b/lib/snmp/test/snmp_appup_test.erl
index 18509526cf..37522b8e3a 100644
--- a/lib/snmp/test/snmp_appup_test.erl
+++ b/lib/snmp/test/snmp_appup_test.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2010. 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
@@ -23,7 +23,7 @@
-module(snmp_appup_test).
-export([
- all/1, init_suite/1, fin_suite/1,
+ all/1, init_per_suite/1, fin_suite/1,
init_per_testcase/2, fin_per_testcase/2,
appup_file/1
@@ -41,14 +41,14 @@ all(suite) ->
[
appup_file
],
- {conf, init_suite, Cases, fin_suite}.
+ {conf, init_per_suite, Cases, fin_suite}.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-init_suite(suite) -> [];
-init_suite(doc) -> [];
-init_suite(Config) when is_list(Config) ->
+init_per_suite(suite) -> [];
+init_per_suite(doc) -> [];
+init_per_suite(Config) when is_list(Config) ->
PrivDir = ?config(priv_dir, Config),
TopDir = filename:join(PrivDir, appup),
case file:make_dir(TopDir) of