aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/test/snmp_test_lib.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2014-08-07 17:36:26 +0200
committerErlang/OTP <[email protected]>2014-08-07 17:36:26 +0200
commit6828c2ed8fdd5f19cad002a7dae07dd5f1c4409c (patch)
treed86469ff46b5b7a53f85f245963e1084f8bd3710 /lib/snmp/test/snmp_test_lib.erl
parentf68b689662dcfba7f6e82bad03938eeb3a48a300 (diff)
parente910f8568a4d19093f7ea8c6865367c3e73703f0 (diff)
downloadotp-6828c2ed8fdd5f19cad002a7dae07dd5f1c4409c.tar.gz
otp-6828c2ed8fdd5f19cad002a7dae07dd5f1c4409c.tar.bz2
otp-6828c2ed8fdd5f19cad002a7dae07dd5f1c4409c.zip
Merge branch 'raimo/snmp/ipv4+ipv6/OTP-12020' into maint-17
* refs/heads/fetch-and-merge.maint-17-opu/FETCH_HEAD/54676: (46 commits) Fix error printouts to not crash Improve ct_snmp test cases Fix misspelled community in manager Rearrange test suite group structure Fix testcase for really dual ip Adjust test cases for daily builds Fix call to non-existent function Fix test manager in agent tests for IPv6 Call new Net-SNMP test suite from top suite Improve external snmp commands args Test inform to dual transports Write list of trap targets Improve dual stack test suite Use {ipv6_v6only, true} Remove commented out code Add dual_ip tests in snmp_to_snmpnet_SUITE Silence logging from agent net_if at shutdown Rewrite agent for IPv4 + IPv6 snmp: Add inform test snmp: Add new test suite ...
Diffstat (limited to 'lib/snmp/test/snmp_test_lib.erl')
-rw-r--r--lib/snmp/test/snmp_test_lib.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index fbb891e40d..5e611340a3 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2002-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
@@ -22,7 +22,7 @@
-include_lib("kernel/include/file.hrl").
--export([hostname/0, hostname/1, localhost/0, os_type/0, sz/1,
+-export([hostname/0, hostname/1, localhost/0, localhost/1, os_type/0, sz/1,
display_suite_info/1]).
-export([non_pc_tc_maybe_skip/4, os_based_skip/1]).
-export([fix_data_dir/1,
@@ -60,6 +60,9 @@ from(_H, []) -> [].
localhost() ->
{ok, Ip} = snmp_misc:ip(net_adm:localhost()),
Ip.
+localhost(Family) ->
+ {ok, Ip} = snmp_misc:ip(net_adm:localhost(), Family),
+ Ip.
sz(L) when is_list(L) ->
length(L);