diff options
| author | Marcus Arendt <[email protected]> | 2014-08-08 15:02:29 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-08-08 15:02:29 +0200 |
| commit | e189bae81fbc873d3349b9dec12ef234daf9d8ad (patch) | |
| tree | 52d2791377955057c44fad4d0479439c900b9c77 /lib/snmp/test/snmp_conf_test.erl | |
| parent | 2525622c384b27581c4b4cb158fc951f15ac5ca3 (diff) | |
| parent | c472c3f5aafc81a409d0443c4601de43bafb53cb (diff) | |
| download | otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.tar.gz otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.tar.bz2 otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.zip | |
Merge branch 'maint-17' into maint
Diffstat (limited to 'lib/snmp/test/snmp_conf_test.erl')
| -rw-r--r-- | lib/snmp/test/snmp_conf_test.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/snmp/test/snmp_conf_test.erl b/lib/snmp/test/snmp_conf_test.erl index c4341d8d7e..7f5d11c0e7 100644 --- a/lib/snmp/test/snmp_conf_test.erl +++ b/lib/snmp/test/snmp_conf_test.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2010. All Rights Reserved. +%% Copyright Ericsson AB 2003-2014. 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 @@ -373,6 +373,8 @@ verify_ip(Val) -> case (catch snmp_conf:check_ip(Val)) of {error, Reason} -> ?FAIL({verify_ip, Val, Reason}); + {ok, _} -> + ok; ok -> ok end. @@ -401,7 +403,7 @@ check_taddress(Config) when is_list(Config) -> ok. verify_taddress(Val) -> - case (catch snmp_conf:check_taddress(Val)) of + case (catch snmp_conf:check_taddress(snmpUDPDomain, Val)) of {error, Reason} -> ?FAIL({verify_taddress, Val, Reason}); ok -> @@ -409,7 +411,7 @@ verify_taddress(Val) -> end. verify_not_taddress(Val) -> - case (catch snmp_conf:check_taddress(Val)) of + case (catch snmp_conf:check_taddress(snmpUDPDomain, Val)) of ok -> ?FAIL({verify_taddress, Val}); {error, _Reason} -> |