diff options
| author | Micael Karlberg <[email protected]> | 2011-02-25 12:03:28 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-02-25 12:03:28 +0100 |
| commit | 02b9003b697474ef6b7e07a6f7eebd6105d4497f (patch) | |
| tree | 8cd1311e1184fb7a4c0958f4cf193ca01b03cf66 /lib/snmp/test | |
| parent | 03014788307572cf1920ddc82bfae0d8d1faf74b (diff) | |
| parent | bb3fef253dc2e1253d7c422c1d9846d13135f847 (diff) | |
| download | otp-02b9003b697474ef6b7e07a6f7eebd6105d4497f.tar.gz otp-02b9003b697474ef6b7e07a6f7eebd6105d4497f.tar.bz2 otp-02b9003b697474ef6b7e07a6f7eebd6105d4497f.zip | |
[agent] For the table vacmAccessTable, when performing the
is_set_ok and set operation(s), all values of the
vacmAccessSecurityModel column was incorrectly translated
to *any*.
Merge branch 'bmk/snmp/verify_vacm_security_model/OTP-8980' into bmk/snmp/snmp419_integration/OTP-9068
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
lib/snmp/test/snmp_appup_test.erl
lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/test')
| -rw-r--r-- | lib/snmp/test/snmp_appup_test.erl | 20 | ||||
| -rw-r--r-- | lib/snmp/test/snmp_test_mgr_misc.erl | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/lib/snmp/test/snmp_appup_test.erl b/lib/snmp/test/snmp_appup_test.erl index b93f960814..99994a2410 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-2010. All Rights Reserved. +%% Copyright Ericsson AB 2003-2011. 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,14 +23,17 @@ -module(snmp_appup_test). -export([ - all/0,groups/0,init_per_group/2,end_per_group/2, init_per_suite/1, - end_per_suite/1, + all/0, + groups/0, init_per_group/2, end_per_group/2, + init_per_suite/1, end_per_suite/1, init_per_testcase/2, end_per_testcase/2, appup_file/1 ]). +-compile({no_auto_import, [error/1]}). + -include_lib("common_test/include/ct.hrl"). -include("snmp_test_lib.hrl"). @@ -38,17 +41,20 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% all() -> -Cases = [appup_file], - Cases. + Cases = + [ + appup_file + ], + Cases. groups() -> []. init_per_group(_GroupName, Config) -> - Config. + Config. end_per_group(_GroupName, Config) -> - Config. + Config. diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl index ef1ba0b948..fc6dedd96d 100644 --- a/lib/snmp/test/snmp_test_mgr_misc.erl +++ b/lib/snmp/test/snmp_test_mgr_misc.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2010. All Rights Reserved. +%% Copyright Ericsson AB 1996-2011. 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 @@ -33,6 +33,8 @@ %% internal exports -export([init_packet/10]). +-compile({no_auto_import, [error/2]}). + -define(SNMP_USE_V3, true). -include_lib("snmp/include/snmp_types.hrl"). |