diff options
author | Raimo Niskanen <[email protected]> | 2014-09-10 12:12:12 +0200 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2014-09-10 12:12:12 +0200 |
commit | 7af44569ffe0b453761fcd7d45a0408d523c5195 (patch) | |
tree | 6fe3869810eee661a11e6afd110c4fb4e3285afb /lib/snmp/test/snmp_manager_config_test.erl | |
parent | 8ef77b62d98b25bc9a66c61336ca62941803c09b (diff) | |
parent | c8d593b389188dc2111015b56d6c218633804bef (diff) | |
download | otp-7af44569ffe0b453761fcd7d45a0408d523c5195.tar.gz otp-7af44569ffe0b453761fcd7d45a0408d523c5195.tar.bz2 otp-7af44569ffe0b453761fcd7d45a0408d523c5195.zip |
Merge branch 'raimo/snmp/manager-ipv4+ipv6/OTP-12108' into maint
* raimo/snmp/manager-ipv4+ipv6/OTP-12108:
Remove debug printouts
Fix manager backwards compat for agent addr
Update .appup
Update documentation
Clean up some config warts
Raise timeout and see if testcases stabilize
Merge manager net_if_mt into net_if
Clean up config error handling and negative results
Remove decommented code and clean up diff
Implement IPv4+IPv6 in MT manager
Avoid test case known to fail
Improve testcase test for IPv6 capable host
Write manager IPv4+IPv6 test
Rewrite manager net_if for IPv4+IPv6
Diffstat (limited to 'lib/snmp/test/snmp_manager_config_test.erl')
-rw-r--r-- | lib/snmp/test/snmp_manager_config_test.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl index 2f5c68d14d..f37e957dae 100644 --- a/lib/snmp/test/snmp_manager_config_test.erl +++ b/lib/snmp/test/snmp_manager_config_test.erl @@ -1048,7 +1048,7 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) -> case config_start(Opts) of {error, Reason51} -> p("start failed (as expected): ~p", [Reason51]), - ?line {failed_check, _, _, _, {bad_address, _}} = Reason51, + ?line {failed_check, _, _, _, {bad_domain, _}} = Reason51, await_config_not_running(); OK_51 -> exit({error, {unexpected_success, "51", OK_51}}) |