aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/test/snmp_manager_test.erl
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2014-09-10 12:12:12 +0200
committerRaimo Niskanen <[email protected]>2014-09-10 12:12:12 +0200
commit7af44569ffe0b453761fcd7d45a0408d523c5195 (patch)
tree6fe3869810eee661a11e6afd110c4fb4e3285afb /lib/snmp/test/snmp_manager_test.erl
parent8ef77b62d98b25bc9a66c61336ca62941803c09b (diff)
parentc8d593b389188dc2111015b56d6c218633804bef (diff)
downloadotp-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_test.erl')
-rw-r--r--lib/snmp/test/snmp_manager_test.erl23
1 files changed, 18 insertions, 5 deletions
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index 78352e59cf..fa90872172 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -584,17 +584,30 @@ init_per_group(event_tests_mt = GroupName, Config) ->
init_per_group(ipv6_mt = GroupName, Config) ->
case ct:require(ipv6_hosts) of
ok ->
- ipv6_init(
- snmp_test_lib:init_group_top_dir(
- GroupName,
- [{manager_net_if_module, snmpm_net_if_mt} | Config]));
+ case gen_udp:open(0, [inet6]) of
+ {ok, S} ->
+ ok = gen_udp:close(S),
+ ipv6_init(
+ snmp_test_lib:init_group_top_dir(
+ GroupName,
+ [{manager_net_if_module, snmpm_net_if_mt}
+ | Config]));
+ {error, _} ->
+ {skip, "Host seems to not support IPv6"}
+ end;
_ ->
{skip, "Host does not support IPV6"}
end;
init_per_group(ipv6 = GroupName, Config) ->
case ct:require(ipv6_hosts) of
ok ->
- ipv6_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
+ case gen_udp:open(0, [inet6]) of
+ {ok, S} ->
+ ok = gen_udp:close(S),
+ ipv6_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
+ {error, _} ->
+ {skip, "Host seems to not support IPv6"}
+ end;
_ ->
{skip, "Host does not support IPV6"}
end;