File 7631-snmp-snmpnet-test-Tweaking-to-more-easily-detect-tim.patch of Package erlang
From 01b108834a198edbb6df887bfd5be51317aeecb8 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 23 Nov 2021 16:44:06 +0100
Subject: [PATCH 1/3] [snmp|snmpnet-test] Tweaking to more easily detect
timeouts
---
lib/snmp/test/snmp_to_snmpnet_SUITE.erl | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
index aacdcff504..b673d0fc0d 100644
--- a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
+++ b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
@@ -52,7 +52,7 @@
expected(?sysDescr_instance = Oid, get) ->
OidStr = oid_str(Oid),
- iolist_to_binary([OidStr | " = STRING: \"Erlang SNMP agent\""]).
+ lists:flatten([OidStr | " = STRING: \"Erlang SNMP agent\""]).
%%--------------------------------------------------------------------
@@ -402,8 +402,19 @@ erlang_agent_netsnmp_get(Config) when is_list(Config) ->
Expected = expected(Oid, get),
try
begin
- [Expected = snmpget(Oid, Transport, Config)
- || Transport <- Transports],
+ [case snmpget(Oid, Transport, Config) of
+ Expected ->
+ ct:pal("Received expected", []),
+ ok;
+ "Timeout: " ++ Rest ->
+ ct:pal("Received unexpected timeout: "
+ "~n ~s", [Rest]),
+ throw({skip, Rest});
+ Any ->
+ ct:pal("Received unexpected reponse: "
+ "~n ~p", [Any]),
+ exit({unexpected, Any})
+ end || Transport <- Transports],
ok
end
catch
@@ -513,7 +524,7 @@ snmpget(Oid, Transport, Config) ->
ProgHandle ->
{_, line, Line} = get_program_output(ProgHandle),
stop_program(ProgHandle),
- Line
+ binary_to_list(Line)
end.
start_snmptrapd(Mibs, Config) ->
--
2.31.1