diff options
author | Ingela Anderton Andin <ingela@erlang.org> | 2016-09-12 16:07:26 +0200 |
---|---|---|
committer | Ingela Anderton Andin <ingela@erlang.org> | 2016-09-12 16:07:26 +0200 |
commit | 44aba0af8d1ddbccf8a7911f307681fc0d726d77 (patch) | |
tree | 7a8f562a1de2a9a8fb67a7711c587be72cc32daa /lib/snmp/test/snmp_agent_test.erl | |
parent | 9553491d25f37ab2f555e60c9f74965299963971 (diff) | |
parent | 622a93103493993a4c8755f116693a9f625d2ad0 (diff) | |
download | otp-44aba0af8d1ddbccf8a7911f307681fc0d726d77.tar.gz otp-44aba0af8d1ddbccf8a7911f307681fc0d726d77.tar.bz2 otp-44aba0af8d1ddbccf8a7911f307681fc0d726d77.zip |
Merge branch 'ingela/snmp/ipv6-tests' into maint
* ingela/snmp/ipv6-tests:
snmp: Use ipv6 common test configuration check
Diffstat (limited to 'lib/snmp/test/snmp_agent_test.erl')
-rw-r--r-- | lib/snmp/test/snmp_agent_test.erl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl index 8ae495bb1b..3c1a6f2afd 100644 --- a/lib/snmp/test/snmp_agent_test.erl +++ b/lib/snmp/test/snmp_agent_test.erl @@ -647,22 +647,22 @@ init_per_group(GroupName, Config) -> snmp_test_lib:init_group_top_dir(GroupName, Config). init_per_group_ipv6(GroupName, Config, Init) -> + {ok, Hostname0} = inet:gethostname(), case ct:require(ipv6_hosts) of ok -> - case gen_udp:open(0, [inet6]) of - {ok, S} -> - ok = gen_udp:close(S), - Init( - snmp_test_lib:init_group_top_dir( - GroupName, - [{ipfamily, inet6}, - {ip, ?LOCALHOST(inet6)} - | lists:keydelete(ip, 1, Config)])); - {error, _} -> - {skip, "Host seems to not support IPv6"} - end; + case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of + true -> + Init( + snmp_test_lib:init_group_top_dir( + GroupName, + [{ipfamily, inet6}, + {ip, ?LOCALHOST(inet6)} + | lists:keydelete(ip, 1, Config)])); + false -> + {skip, "Host does not support IPV6"} + end; _ -> - {skip, "Host does not support IPV6"} + {skip, "Test config ipv6_hosts is missing"} end. end_per_group(all_tcs, Config) -> |